[Comgr] Add -nogpu options to HIP tests

Now that we no longer pass -nogpuinc by default for HIP
compilations (#f5f4090), we need to pass it manually for these
tests

Author: lamb-j

amd/comgr/test/compile_hip_test.c

@@ -47,6 +47,9 @@ int main(int Argc, char *Argv[]) {
       DataSetReloc, DataSetExec;
   amd_comgr_action_info_t ActionInfo;
   amd_comgr_status_t Status;
+  const char *CompileOptions[] = {"-nogpulib", "-nogpuinc"};
+  size_t CompileOptionsCount =
+    sizeof(CompileOptions) / sizeof(CompileOptions[0]);
 
   SizeSource = setBuf(TEST_OBJ_DIR "/source1.hip", &BufSource);
 
@@ -69,6 +72,9 @@ int main(int Argc, char *Argv[]) {
   Status = amd_comgr_action_info_set_isa_name(ActionInfo,
                                               "amdgcn-amd-amdhsa--gfx906");
   checkError(Status, "amd_comgr_action_info_set_isa_name");
+  Status = amd_comgr_action_info_set_option_list(ActionInfo, CompileOptions,
+                                                 CompileOptionsCount);
+  checkError(Status, "amd_comgr_action_info_set_option_list");
 
   Status = amd_comgr_create_data_set(&DataSetBc);
   checkError(Status, "amd_comgr_create_data_set");

amd/comgr/test/compile_hip_to_relocatable.c

@@ -46,9 +46,10 @@ int main(int argc, char *argv[]) {
   amd_comgr_data_set_t DataSetIn, DataSetReloc, DataSetExec;
   amd_comgr_action_info_t DataAction;
   amd_comgr_status_t Status;
-  const char *CodeGenOptions[] = {"-fno-slp-vectorize"};
-  size_t CodeGenOptionsCount =
-      sizeof(CodeGenOptions) / sizeof(CodeGenOptions[0]);
+  const char *CompileOptions[] = {"-fno-slp-vectorize", "-nogpulib",
+    "-nogpuinc"};
+  size_t CompileOptionsCount =
+    sizeof(CompileOptions) / sizeof(CompileOptions[0]);
 
   SizeSource = setBuf(TEST_OBJ_DIR "/source1.hip", &BufSource);
 
@@ -76,8 +77,8 @@ int main(int argc, char *argv[]) {
                                               "amdgcn-amd-amdhsa--gfx906");
   checkError(Status, "amd_comgr_action_info_set_isa_name");
 
-  Status = amd_comgr_action_info_set_option_list(DataAction, CodeGenOptions,
-                                                 CodeGenOptionsCount);
+  Status = amd_comgr_action_info_set_option_list(DataAction, CompileOptions,
+                                                 CompileOptionsCount);
   checkError(Status, "amd_comgr_action_info_set_option_list");
 
   Status = amd_comgr_do_action(AMD_COMGR_ACTION_COMPILE_SOURCE_TO_RELOCATABLE,

amd/comgr/test/mangled_names_hip_test.c

@@ -48,6 +48,9 @@ int main(int argc, char *argv[]) {
   amd_comgr_action_info_t DataAction;
   amd_comgr_status_t Status;
   size_t Count;
+  const char *CompileOptions[] = {"-nogpulib", "-nogpuinc"};
+  size_t CompileOptionsCount =
+    sizeof(CompileOptions) / sizeof(CompileOptions[0]);
 
   SizeSource = setBuf(TEST_OBJ_DIR "/source1.hip", &BufSource);
 
@@ -71,6 +74,9 @@ int main(int argc, char *argv[]) {
   Status = amd_comgr_action_info_set_isa_name(DataAction,
                                               "amdgcn-amd-amdhsa--gfx900");
   checkError(Status, "amd_comgr_action_info_set_isa_name");
+  Status = amd_comgr_action_info_set_option_list(DataAction, CompileOptions,
+                                                 CompileOptionsCount);
+  checkError(Status, "amd_comgr_action_info_set_option_list");
 
   Status = amd_comgr_create_data_set(&DataSetBc);
   checkError(Status, "amd_comgr_create_data_set");

amd/comgr/test/name_expression_map_test.c

@@ -48,6 +48,9 @@ int main(int argc, char *argv[]) {
   amd_comgr_action_info_t DataAction;
   amd_comgr_status_t Status;
   size_t Count;
+  const char *CompileOptions[] = {"-nogpulib", "-nogpuinc"};
+  size_t CompileOptionsCount =
+    sizeof(CompileOptions) / sizeof(CompileOptions[0]);
 
   SizeSource = setBuf(TEST_OBJ_DIR "/name-expression.hip", &BufSource);
 
@@ -71,6 +74,9 @@ int main(int argc, char *argv[]) {
   Status = amd_comgr_action_info_set_isa_name(DataAction,
                                               "amdgcn-amd-amdhsa--gfx900");
   checkError(Status, "amd_comgr_action_info_set_isa_name");
+  Status = amd_comgr_action_info_set_option_list(DataAction, CompileOptions,
+                                                 CompileOptionsCount);
+  checkError(Status, "amd_comgr_action_info_set_option_list");
 
   Status = amd_comgr_create_data_set(&DataSetBc);
   checkError(Status, "amd_comgr_create_data_set");