Skip to content

Commit 46ada0d

Browse files
authored
[Comgr] Remove deprecated action from tests
1 parent b0c6307 commit 46ada0d

File tree

2 files changed

+8
-48
lines changed

2 files changed

+8
-48
lines changed

amd/comgr/test/compile_source_with_device_libs_to_bc_test.c

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ int main(int argc, char *argv[]) {
1616
char *BufSource;
1717
size_t SizeSource;
1818
amd_comgr_data_t DataSource;
19-
amd_comgr_data_set_t DataSetIn, DataSetPch, DataSetBc, DataSetLinked,
20-
DataSetReloc, DataSetExec;
19+
amd_comgr_data_set_t DataSetIn, DataSetBc, DataSetLinked, DataSetReloc,
20+
DataSetExec;
2121
amd_comgr_action_info_t DataAction;
2222
amd_comgr_status_t Status;
2323
const char *CodeGenOptions[] = {"-mcode-object-version=5", "-mllvm",
@@ -48,25 +48,6 @@ int main(int argc, char *argv[]) {
4848
"amdgcn-amd-amdhsa--gfx900");
4949
checkError(Status, "amd_comgr_action_info_set_isa_name");
5050

51-
Status = amd_comgr_create_data_set(&DataSetPch);
52-
checkError(Status, "amd_comgr_create_data_set");
53-
54-
Status = amd_comgr_do_action(AMD_COMGR_ACTION_ADD_PRECOMPILED_HEADERS,
55-
DataAction, DataSetIn, DataSetPch);
56-
checkError(Status, "amd_comgr_do_action");
57-
58-
size_t Count;
59-
Status = amd_comgr_action_data_count(
60-
DataSetPch, AMD_COMGR_DATA_KIND_PRECOMPILED_HEADER, &Count);
61-
checkError(Status, "amd_comgr_action_data_count");
62-
63-
if (Count != 0) {
64-
printf("AMD_COMGR_ACTION_ADD_PRECOMPILED_HEADERS Failed: "
65-
"produced %zu precompiled header objects (expected 0)\n",
66-
Count);
67-
exit(1);
68-
}
69-
7051
Status = amd_comgr_create_data_set(&DataSetBc);
7152
checkError(Status, "amd_comgr_create_data_set");
7253

@@ -76,9 +57,10 @@ int main(int argc, char *argv[]) {
7657

7758
Status = amd_comgr_do_action(
7859
AMD_COMGR_ACTION_COMPILE_SOURCE_WITH_DEVICE_LIBS_TO_BC, DataAction,
79-
DataSetPch, DataSetBc);
60+
DataSetIn, DataSetBc);
8061
checkError(Status, "amd_comgr_do_action");
8162

63+
size_t Count;
8264
Status =
8365
amd_comgr_action_data_count(DataSetBc, AMD_COMGR_DATA_KIND_BC, &Count);
8466
checkError(Status, "amd_comgr_action_data_count");
@@ -151,8 +133,6 @@ int main(int argc, char *argv[]) {
151133
checkError(Status, "amd_comgr_release_data");
152134
Status = amd_comgr_destroy_data_set(DataSetIn);
153135
checkError(Status, "amd_comgr_destroy_data_set");
154-
Status = amd_comgr_destroy_data_set(DataSetPch);
155-
checkError(Status, "amd_comgr_destroy_data_set");
156136
Status = amd_comgr_destroy_data_set(DataSetBc);
157137
checkError(Status, "amd_comgr_destroy_data_set");
158138
Status = amd_comgr_destroy_data_set(DataSetLinked);

amd/comgr/test/compile_source_with_device_libs_to_bc_with_vfs_test.c

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ int main(int argc, char *argv[]) {
1616
char *BufSource;
1717
size_t SizeSource;
1818
amd_comgr_data_t DataSource;
19-
amd_comgr_data_set_t DataSetIn, DataSetPch, DataSetBc, DataSetLinked,
20-
DataSetReloc, DataSetExec;
19+
amd_comgr_data_set_t DataSetIn, DataSetBc, DataSetLinked, DataSetReloc,
20+
DataSetExec;
2121
amd_comgr_action_info_t DataAction;
2222
amd_comgr_status_t Status;
2323
const char *CodeGenOptions[] = {"-mcode-object-version=5", "-mllvm",
@@ -51,25 +51,6 @@ int main(int argc, char *argv[]) {
5151
Status = amd_comgr_action_info_set_vfs(DataAction, true);
5252
checkError(Status, "amd_comgr_action_info_set_vfs");
5353

54-
Status = amd_comgr_create_data_set(&DataSetPch);
55-
checkError(Status, "amd_comgr_create_data_set");
56-
57-
Status = amd_comgr_do_action(AMD_COMGR_ACTION_ADD_PRECOMPILED_HEADERS,
58-
DataAction, DataSetIn, DataSetPch);
59-
checkError(Status, "amd_comgr_do_action");
60-
61-
size_t Count;
62-
Status = amd_comgr_action_data_count(
63-
DataSetPch, AMD_COMGR_DATA_KIND_PRECOMPILED_HEADER, &Count);
64-
checkError(Status, "amd_comgr_action_data_count");
65-
66-
if (Count != 0) {
67-
printf("AMD_COMGR_ACTION_ADD_PRECOMPILED_HEADERS Failed: "
68-
"produced %zu precompiled header objects (expected 0)\n",
69-
Count);
70-
exit(1);
71-
}
72-
7354
Status = amd_comgr_create_data_set(&DataSetBc);
7455
checkError(Status, "amd_comgr_create_data_set");
7556

@@ -79,9 +60,10 @@ int main(int argc, char *argv[]) {
7960

8061
Status = amd_comgr_do_action(
8162
AMD_COMGR_ACTION_COMPILE_SOURCE_WITH_DEVICE_LIBS_TO_BC, DataAction,
82-
DataSetPch, DataSetBc);
63+
DataSetIn, DataSetBc);
8364
checkError(Status, "amd_comgr_do_action");
8465

66+
size_t Count;
8567
Status =
8668
amd_comgr_action_data_count(DataSetBc, AMD_COMGR_DATA_KIND_BC, &Count);
8769
checkError(Status, "amd_comgr_action_data_count");
@@ -154,8 +136,6 @@ int main(int argc, char *argv[]) {
154136
checkError(Status, "amd_comgr_release_data");
155137
Status = amd_comgr_destroy_data_set(DataSetIn);
156138
checkError(Status, "amd_comgr_destroy_data_set");
157-
Status = amd_comgr_destroy_data_set(DataSetPch);
158-
checkError(Status, "amd_comgr_destroy_data_set");
159139
Status = amd_comgr_destroy_data_set(DataSetBc);
160140
checkError(Status, "amd_comgr_destroy_data_set");
161141
Status = amd_comgr_destroy_data_set(DataSetLinked);

0 commit comments

Comments
 (0)