fixed issue that caused allocation of RTDispatchGlobals by default

RenderKit · ct-clmsn · Feb 3, 2023 · Mar 8, 2023 · Mar 10, 2023 · Mar 10, 2023
commit ba2f59141c15c541a3136a8b3fbb821201226aa7
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -187,7 +187,7 @@ IF (EMBREE_SYCL_RT_VALIDATION_API)
 ENDIF()
 
 CMAKE_DEPENDENT_OPTION(EMBREE_SYCL_IMPLICIT_DISPATCH_GLOBALS "Using L0 allocated Dispatch Globals" ON "EMBREE_SYCL_RT_VALIDATION_API" OFF)
-IF (NOT EMBREE_SYCL_IMPLICIT_DISPATCH_GLOBALS)
+IF (EMBREE_SYCL_RT_VALIDATION_API AND NOT EMBREE_SYCL_IMPLICIT_DISPATCH_GLOBALS)
   ADD_DEFINITIONS("-DEMBREE_SYCL_ALLOC_DISPATCH_GLOBALS")
 ENDIF()
 

diff --git a/kernels/rthwif/CMakeLists.txt b/kernels/rthwif/CMakeLists.txt
@@ -68,8 +68,8 @@ ELSE()
   option(EMBREE_BUILDER_TBB_STATIC "Use a staticaly compiled TBB version for the Embree builder for GPU." OFF)
 ENDIF()
 
-IF (NOT EMBREE_SYCL_IMPLICIT_DISPATCH_GLOBALS)
-  ADD_DEFINITIONS("-DEMBREE_SYCL_ALLOC_DISPATCH_GLOBALS")
+IF (EMBREE_SYCL_RT_VALIDATION_API AND NOT EMBREE_SYCL_IMPLICIT_DISPATCH_GLOBALS)
+    ADD_DEFINITIONS("-DEMBREE_SYCL_ALLOC_DISPATCH_GLOBALS")
 ENDIF()
 
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-bitwise-instead-of-logical") # disables "use of bitwise '&' with boolean operands" warning

diff --git a/kernels/rthwif/testing/CMakeLists.txt b/kernels/rthwif/testing/CMakeLists.txt
@@ -14,10 +14,6 @@ IF (NOT DEFINED EMBREE_SYCL_IMPLICIT_DISPATCH_GLOBALS)
   OPTION(EMBREE_SYCL_IMPLICIT_DISPATCH_GLOBALS "Using L0 allocated Dispatch Globals" ON)
 ENDIF()
 
-IF (NOT EMBREE_SYCL_IMPLICIT_DISPATCH_GLOBALS)
-  ADD_DEFINITIONS("-DEMBREE_SYCL_ALLOC_DISPATCH_GLOBALS")
-ENDIF()
-
 IF (NOT DEFINED EMBREE_SYCL_RT_VALIDATION_API)
   OPTION(EMBREE_SYCL_RT_VALIDATION_API "Use rt_validation API instead of IGC provided rt_production API" OFF)
 ENDIF()
@@ -26,6 +22,10 @@ IF (EMBREE_SYCL_RT_VALIDATION_API)
   ADD_DEFINITIONS("-DEMBREE_SYCL_RT_VALIDATION_API")
 ENDIF()
 
+IF (EMBREE_SYCL_RT_VALIDATION_API AND NOT EMBREE_SYCL_IMPLICIT_DISPATCH_GLOBALS)
+  ADD_DEFINITIONS("-DEMBREE_SYCL_ALLOC_DISPATCH_GLOBALS")
+ENDIF()
+
 IF (EMBREE_SYCL_RT_SIMULATION)
   SET(RT_SIM_LIBRARY rtcore)
 ENDIF()
@@ -82,4 +82,4 @@ ADD_TEST(NAME rthwif_test_swinstancing_triangles_committed_hit        COMMAND em
 ADD_TEST(NAME rthwif_test_swinstancing_triangles_potential_hit        COMMAND embree_rthwif_test --sw-instancing --triangles-potential-hit)
 ADD_TEST(NAME rthwif_test_swinstancing_triangles_anyhit_shader_commit COMMAND embree_rthwif_test --sw-instancing --triangles-anyhit-shader-commit)
 ADD_TEST(NAME rthwif_test_swinstancing_triangles_anyhit_shader_reject COMMAND embree_rthwif_test --sw-instancing --triangles-anyhit-shader-reject)
-ADD_TEST(NAME rthwif_test_swinstancing_procedurals_committed_hit      COMMAND embree_rthwif_test --sw-instancing --procedurals-committed-hit)
+ADD_TEST(NAME rthwif_test_swinstancing_procedurals_committed_hit      COMMAND embree_rthwif_test --sw-instancing --procedurals-committed-hit)
diff --git a/kernels/rthwif/testing/rthwif_test.cpp b/kernels/rthwif/testing/rthwif_test.cpp
@@ -2102,7 +2102,9 @@ int main(int argc, char* argv[])
   sycl::queue queue = sycl::queue(device,exception_handler);
   context = queue.get_context();
 
+#if defined(EMBREE_SYCL_ALLOC_DISPATCH_GLOBALS)
   dispatchGlobalsPtr = allocDispatchGlobals(device,context);
+#endif
 
   /* execute test */
   RandomSampler_init(rng,0x56FE238A);
@@ -2123,7 +2125,9 @@ int main(int argc, char* argv[])
   if (err != ZE_RESULT_SUCCESS_)
     throw std::runtime_error("parallel operation destruction failed");
 
+#if defined(EMBREE_SYCL_ALLOC_DISPATCH_GLOBALS)
   sycl::free(dispatchGlobalsPtr, context);
+#endif
 
   zeRaytracingExitExt();