gtests: add regression test for PVC WAR bug workaround

Author: echeresh

src/gpu/intel/compute/device_info.hpp

@@ -49,7 +49,7 @@ struct alignas(int) gpu_product_t {
     unsigned char data[12];
 };
 
-static inline std::string to_string(gpu_arch_t arch) {
+static inline const char *to_string(gpu_arch_t arch) {
 #define CASE(_case) \
     if (arch == gpu_arch_t::_case) return STRINGIFY(_case)
     CASE(xe_lp);

src/gpu/intel/engine.cpp

@@ -88,10 +88,19 @@ status_t engine_t::init(const std::vector<uint8_t> &cache_blob) {
 } // namespace impl
 } // namespace dnnl
 
-bool dnnl_impl_gpu_mayiuse_ngen_kernels(dnnl::impl::engine_t *engine) {
+bool dnnl_impl_gpu_intel_mayiuse_ngen_kernels(dnnl::impl::engine_t *engine) {
     using namespace dnnl::impl;
     using namespace dnnl::impl::gpu;
 
     auto *intel_engine = utils::downcast<intel::engine_t *>(engine);
     return intel_engine->mayiuse_ngen_kernels();
 }
+
+const char *dnnl_impl_gpu_intel_get_isa_name(dnnl::impl::engine_t *engine) {
+    using namespace dnnl::impl;
+    using namespace dnnl::impl::gpu;
+
+    auto *intel_engine = utils::downcast<intel::engine_t *>(engine);
+    auto *device_info = intel_engine->device_info();
+    return intel::compute::to_string(device_info->gpu_arch());
+}

src/gpu/intel/engine.hpp

@@ -212,7 +212,9 @@ class engine_t : public gpu::engine_t {
 } // namespace dnnl
 
 // Exported for testing purposes only.
-extern "C" bool DNNL_API dnnl_impl_gpu_mayiuse_ngen_kernels(
+extern "C" bool DNNL_API dnnl_impl_gpu_intel_mayiuse_ngen_kernels(
+        dnnl::impl::engine_t *engine);
+extern "C" DNNL_API const char *dnnl_impl_gpu_intel_get_isa_name(
         dnnl::impl::engine_t *engine);
 
 #endif

tests/gtests/ocl/api/test_engine.cpp

@@ -23,7 +23,7 @@
 #include <string>
 #include <CL/cl.h>
 
-extern "C" bool dnnl_impl_gpu_mayiuse_ngen_kernels(dnnl_engine_t engine);
+extern "C" bool dnnl_impl_gpu_intel_mayiuse_ngen_kernels(dnnl_engine_t engine);
 
 namespace dnnl {
 namespace {
@@ -287,7 +287,7 @@ TEST_P(ocl_engine_test_t, BinaryKernels) {
 //DNNL_ENABLE_MEM_DEBUG forces allocation fail, causing mayiuse to fail
 #ifndef DNNL_ENABLE_MEM_DEBUG
     if (s == dnnl_success) {
-        ASSERT_EQ(dnnl_impl_gpu_mayiuse_ngen_kernels(eng), true);
+        ASSERT_EQ(dnnl_impl_gpu_intel_mayiuse_ngen_kernels(eng), true);
     }
 #endif
 

tests/gtests/regression/CMakeLists.txt

@@ -14,9 +14,22 @@
 # limitations under the License.
 #===============================================================================
 
-set(TEST_EXE test_regression)
+set(TEST_SOURCES
+    test_regression_binary_stride.cpp
+)
 
-file(GLOB TEST_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/test_*.cpp)
-list(APPEND TEST_SOURCES ${MAIN_SRC_GTEST})
+if(UNIX)
+    set(TEST_SOURCES "${TEST_SOURCES};test_regression_pvc_war_wa.cpp")
+endif()
 
-register_exe(${TEST_EXE} "${TEST_SOURCES}" "test" "dnnl_gtest")
+foreach(TEST_FILE ${TEST_SOURCES})
+    get_filename_component(exe ${TEST_FILE} NAME_WE)
+    register_exe("${exe}" "${CMAKE_CURRENT_SOURCE_DIR}/${TEST_FILE};${MAIN_SRC_GTEST}" "test" "dnnl_gtest")
+endforeach()
+
+if(TARGET test_regression_pvc_war_wa)
+    # Regression test for PVC WAR bug workaround. The bug is triggered by setting
+    # round-robin thread arbitration policy so override it here.
+    set_tests_properties(test_regression_pvc_war_wa
+        PROPERTIES ENVIRONMENT "NEOReadDebugKeys=1;OverrideThreadArbitrationPolicy=1")
+endif()