adding mytest target

Change-Id: Ia82b971597a4876d99c85d7dbbf997faea83f0c9

test/CMakeLists.txt

@@ -61,12 +61,15 @@ set ( CTRL_SRC
 
 ## Dummy kernel
 set ( DUMMY_NAME dummy_kernel )
-execute_process ( COMMAND sh -xc "${TEST_DIR}/../bin/build_kernel.sh ${TEST_DIR}/${DUMMY_NAME}/${DUMMY_NAME} ${PROJECT_BINARY_DIR}" )
-
 ## Test kernel
 set ( TEST_NAME simple_convolution )
 set ( KERN_SRC ${TEST_DIR}/${TEST_NAME}/${TEST_NAME}.cpp )
-execute_process ( COMMAND sh -xc "${TEST_DIR}/../bin/build_kernel.sh ${TEST_DIR}/${TEST_NAME}/${TEST_NAME} ${PROJECT_BINARY_DIR}" )
+
+## Building test kernels
+add_custom_target( mytest
+  COMMAND sh -xc "${TEST_DIR}/../bin/build_kernel.sh ${TEST_DIR}/${DUMMY_NAME}/${DUMMY_NAME} ${PROJECT_BINARY_DIR} '${ROCM_ROOT_DIR}' '${GPU_TARGETS}'"
+  COMMAND sh -xc "${TEST_DIR}/../bin/build_kernel.sh ${TEST_DIR}/${TEST_NAME}/${TEST_NAME} ${PROJECT_BINARY_DIR} '${ROCM_ROOT_DIR}' '${GPU_TARGETS}'"
+)
 
 ## Building standalone test executable
 add_executable ( ${STEXE_NAME} ${STTST_SRC} ${UTIL_SRC} ${KERN_SRC} )

test/ctrl/test_hsa.cpp

@@ -82,14 +82,7 @@ bool TestHsa::Initialize(int /*arg_cnt*/, char** /*arg_list*/) {
 
   // Obtain the code object file name
   std::string agentName(agent_info_->name);
-  if (agentName.compare(0, 4, "gfx8") == 0) {
-    brig_path_obj_.append("gfx8");
-  } else if (agentName.compare(0, 4, "gfx9") == 0) {
-    brig_path_obj_.append("gfx9");
-  } else {
-    TEST_ASSERT(false);
-    return false;
-  }
+  brig_path_obj_.append(agentName);
   brig_path_obj_.append("_" + name_ + ".hsaco");
 
   return true;