Enable trsm test on NVIDIA GPUs when using DEFAULT TUNING_TARGET (#518)

codeplaysoftware · May 27, 2024 · a27dcab · a27dcab
1 parent c6d3cad
commit a27dcab
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 11 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -169,6 +169,7 @@ if (INSTALL_HEADER_ONLY)
     (${TUNING_TARGET} STREQUAL "INTEL_GPU") )
       target_compile_options(portblas INTERFACE -fno-fast-math)
       target_compile_options(portblas INTERFACE -mllvm=-loopopt=0)
+      target_link_options(portblas INTERFACE -mllvm=-loopopt=0)
       message(STATUS "Adding -fno-fast-math -mllvm=-loopopt=0 to portblas")
   endif()
 else()

diff --git a/cmake/Modules/FindDPCPP.cmake b/cmake/Modules/FindDPCPP.cmake
@@ -102,6 +102,7 @@ function(add_sycl_to_target)
     (${TUNING_TARGET} STREQUAL "INTEL_GPU") )
     target_compile_options(${SB_ADD_SYCL_TARGET} PRIVATE -fno-fast-math)
     target_compile_options(${SB_ADD_SYCL_TARGET} PRIVATE -mllvm=-loopopt=0)
+    target_link_options(${SB_ADD_SYCL_TARGET} PRIVATE -mllvm=-loopopt=0)
     message(STATUS "Adding -fno-fast-math -mllvm=-loopopt=0 to target ${SB_ADD_SYCL_TARGET}")
   endif()
   if ((${CMAKE_CXX_COMPILER_ID} STREQUAL "IntelLLVM"

diff --git a/src/operations/blas3/gemm_no_local_full_vec.hpp b/src/operations/blas3/gemm_no_local_full_vec.hpp
@@ -381,7 +381,7 @@ class Gemm<input_t, output_t, DoubleBuffer, NbcA, NbcB, ClSize, tile_type,
       auto C = orig_C;
 
       /* register array used to store the result*/
-      value_t reg_res[item_rows * item_cols];
+      element_t reg_res[item_rows * item_cols];
       scaling_c<need_check_boundary, packet_size>(
           reg_res, C, ldc, dim_m_a_start, dim_n_b_start, boundary_check_c,
           out_of_range);

diff --git a/test/unittest/CMakeLists.txt b/test/unittest/CMakeLists.txt
@@ -103,16 +103,6 @@ if(is_dpcpp)
   )
 endif()
 
-if(is_dpcpp AND ${TUNING_TARGET} STREQUAL "DEFAULT")
-  if (${DPCPP_SYCL_TARGET} MATCHES "nvidia")
-    set(TESTS_TO_SKIP
-      ${PORTBLAS_UNITTEST}/blas3/blas3_trsm_test.cpp
-      )
-    message(WARNING "Targetting NVIDIA hardware with DEFAULT TUNING_TARGET.
-    Disabling tests for following operator: trsm.")
-  endif()
-endif()
-
 if(GEMM_TALL_SKINNY_SUPPORT)
   list(APPEND SYCL_UNITTEST_SRCS ${PORTBLAS_UNITTEST}/blas3/blas3_gemm_tall_skinny_test.cpp)
 endif()