Merge branch 'amd-develop-staging-0423' into amd-master

test/transpose/CMakeLists.txt

-list(APPEND gpu_list gfx908 gfx90a gfx940 gfx941 gfx942)
-set(target 0)
-foreach(gpu IN LISTS GPU_TARGETS)
- if(gpu IN_LIST gpu_list AND target EQUAL 0)
-   add_gtest_executable(test_transpose test_transpose.cpp)
-   target_link_libraries(test_transpose PRIVATE utility device_transpose_instance)
-   set(target 1)
- endif()
-endforeach()
+add_gtest_executable(test_transpose test_transpose_xdl.cpp)
+if(result EQUAL 0)
+    target_link_libraries(test_transpose PRIVATE utility device_transpose_instance)
+endif()

test/wrapper/CMakeLists.txt

@@ -12,10 +12,8 @@ add_dependencies(test_wrapper test_wrapper_copy)
 add_gtest_executable(test_wrapper_partition test_wrapper_partition.cpp)
 target_link_libraries(test_wrapper_partition PRIVATE utility)
 add_dependencies(test_wrapper test_wrapper_partition)
-if(GPU_TARGETS MATCHES "gfx908" OR GPU_TARGETS MATCHES "gfx90a" OR
-   GPU_TARGETS MATCHES "gfx940" OR GPU_TARGETS MATCHES "gfx941" OR
-   GPU_TARGETS MATCHES "gfx942")
-    add_gtest_executable(test_wrapper_gemm test_wrapper_gemm.cpp)
+add_gtest_executable(test_wrapper_gemm test_wrapper_gemm_xdl.cpp)
+if(result EQUAL 0)
     target_link_libraries(test_wrapper_gemm PRIVATE utility)
     add_dependencies(test_wrapper test_wrapper_gemm)
 endif()