Frei/device memory support rebased

.github/workflows/continuous.yml

@@ -49,6 +49,38 @@ jobs:
         cmake --preset linux-DG2-JIT-INTERNAL -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=3
         cmake --build build --config Release --target test_package
 
+  linux-DG2-JIT-BVH-HOST-DEVICE-build:
+    secrets: inherit
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
+    with:
+      image: embree/ubuntu:22.04
+      runs-on: '[ "Linux", "docker", "build" ]'
+      project: embree
+      dpcpp-version: intel-llvm/sycl-rel_5_2_0-rk
+      artifact-out: linux-DG2-JIT-BVH-HOST-DEVICE-build
+      artifact-path: ./build/*.tar.gz
+      cmd: |
+        module load cmake/3.25.3
+        cmake --preset linux-DG2-JIT-INTERNAL -DEMBREE_SYCL_BVH_DATA_HOST_DEVICE=ON -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=3
+        cmake --build build --config Release --target build
+
+  linux-DG2-JIT-BVH-HOST-DEVICE-test:
+    secrets: inherit
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
+    needs: ["linux-DG2-JIT-BVH-HOST-DEVICE-build"]
+    with:
+      image: embree/ubuntu:22.04
+      options: --device=/dev/dri:/dev/dri
+      runs-on: '[ "Linux", "docker", "dg2" ]'
+      project: embree
+      env-from-files: ./.github/workflows/gfx-ubuntu22-internal.env
+      dpcpp-version: intel-llvm/sycl-rel_5_2_0-rk
+      artifact-in: linux-DG2-JIT-BVH-HOST-DEVICE-build
+      cmd: |
+        module load cmake/3.25.3
+        cmake --preset linux-DG2-JIT-INTERNAL -DEMBREE_SYCL_BVH_DATA_HOST_DEVICE=ON -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=3
+        cmake --build build --config Release --target test_package
+
   linux-DG2-JIT-PUBLIC-build:
     secrets: inherit
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
@@ -301,6 +333,33 @@ jobs:
         cmake --preset nightly-windows-DG2-JIT-ICX -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=3
         cmake --build build --config Release --target test_package
 
+  windows-DG2-JIT-BVH-HOST-DEVICE-build:
+    secrets: inherit
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main
+    with:
+      force-delete: true
+      runs-on: '[ "Windows", "NAS", "build" ]'
+      project: embree
+      env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env
+      artifact-out: windows-DG2-JIT-BVH-HOST-DEVICE-build
+      artifact-path: ./build/*.zip
+      cmd: |
+        cmake --preset windows-DG2-JIT-INTERNAL-L0RTAS -DEMBREE_SYCL_BVH_DATA_HOST_DEVICE=ON -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=3
+        cmake --build build --config Release --target build
+
+  windows-DG2-JIT-BVH-HOST-DEVICE-test:
+    secrets: inherit
+    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main
+    needs: ["windows-DG2-JIT-BVH-HOST-DEVICE-build"]
+    with:
+      runs-on: '[ "Windows", "NAS", "dg2" ]'
+      project: embree
+      env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-internal.env
+      artifact-in: windows-DG2-JIT-BVH-HOST-DEVICE-build
+      cmd: |
+        cmake --preset windows-DG2-JIT-INTERNAL-L0RTAS -DEMBREE_SYCL_BVH_DATA_HOST_DEVICE=ON -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=3
+        cmake --build build --config Release --target test_package
+
 #   ################################################################################
 #   ################################################################################
 #   # CPU tests
@@ -479,6 +538,7 @@ jobs:
     runs-on: ubuntu-latest
     needs:
       - linux-DG2-JIT-INTERNAL-test
+      - linux-DG2-JIT-BVH-HOST-DEVICE-test
       - linux-DG2-JIT-PUBLIC-test
       - linux-DG2-JIT-PUBLIC-ICX-test
       - linux-PVC-JIT-INTERNAL-test-1T
@@ -488,6 +548,7 @@ jobs:
       - windows-DG2-JIT-PUBLIC-test
       - windows-DG2-JIT-ICX-INTERNAL-test
       - windows-DG2-JIT-ICX-PUBLIC-test
+      - windows-DG2-JIT-BVH-HOST-DEVICE-test
       - linux-fedora29-CLANG4
       - linux-fedora29-CLANG5-INT-ADDRSANITIZER
       - linux-fedora29-ICX

.github/workflows/gfx-ubuntu22-internal.env

@@ -1 +1 @@
-GFX_DRIVER_VERSION=neo-builds/ci/master/ci-neo-master-030966/artifacts/linux/ubuntu/22.04
+GFX_DRIVER_VERSION=neo-builds/ci/master/ci-neo-master-032074/artifacts/linux/ubuntu/22.04

.github/workflows/gfx-windows-internal.env

@@ -1 +1 @@
-GFX_DRIVER_VERSION=gfx-driver-builds/ci/master/gfx-driver-ci-master-17345/artifacts/Windows
+GFX_DRIVER_VERSION=gfx-driver-builds/ci/master/gfx-driver-ci-master-18078/artifacts/Windows

.github/workflows/nightly.yml

@@ -51,37 +51,6 @@ jobs:
         cmake --preset nightly-linux-DG2-JIT-MULTILEVEL -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=3
         cmake --build build --config Release --target test_package
 
-  nightly-linux-DG2-INTERNAL-L0RTAS-build:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
-    with:
-      image: embree/ubuntu:22.04
-      runs-on: '[ "Linux", "docker", "build" ]'
-      project: embree
-      dpcpp-version: intel-llvm/nightly-2023-12-18-rk
-      artifact-out: nightly-linux-DG2-INTERNAL-L0RTAS-build
-      artifact-path: ./build/*.tar.gz
-      cmd: |
-        module load cmake/3.25.3
-        cmake --preset nightly-linux-DG2-INTERNAL-L0RTAS -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=3
-        cmake --build build --config Release --target build
-
-  linux-DG2-JIT-INTERNAL-L0RTAS-test:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
-    needs: ["nightly-linux-DG2-INTERNAL-L0RTAS-build"]
-    with:
-      image: embree/ubuntu:22.04
-      options: --device=/dev/dri:/dev/dri
-      runs-on: '[ "Linux", "docker", "dg2" ]'
-      project: embree
-      env-from-files: ./.github/workflows/gfx-ubuntu22-public.env
-      artifact-in: nightly-linux-DG2-INTERNAL-L0RTAS-build
-      cmd: |
-        module load cmake/3.25.3
-        cmake --preset nightly-linux-DG2-INTERNAL-L0RTAS -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=3
-        cmake --build build --config Release --target test_package
-
   linux-DG2-JIT-PUBLIC-sycl-RC-build:
     secrets: inherit
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
@@ -381,18 +350,6 @@ jobs:
         cmake --preset nightly-windows-DG2-JIT -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=4
         cmake --build build --config Release --target test_package
 
-  windows-DG2-JIT-INTERNAL-VALIDATION_API:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main
-    with:
-      runs-on: '[ "Windows", "NAS", "dg2" ]'
-      project: embree
-      env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-public.env
-      cmd: |
-        python scripts/test.py configure platform:x64 compiler:dpcpp isa:SSE2 build:Release EMBREE_SYCL_SUPPORT:ON sycl:none rt_validation_api:ON implicit_dispatch_globals:OFF L0RTAS:OFF intensity:3 tasking:TBB2020.3
-        python scripts/test.py build
-        python scripts/test.py test
-
   windows-DG2-JIT-sycl-RC-build:
     secrets: inherit
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main
@@ -421,31 +378,30 @@ jobs:
         cmake --preset nightly-windows-DG2-JIT -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=3
         cmake --build build --config Release --target test_package
 
-  windows-DG2-JIT-INTERNAL-L0RTAS-build:
+  nightly-windows-DG2-MULTILEVEL-build:
     secrets: inherit
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main
     with:
-      force-delete: true
-      runs-on: '[ "Windows", "NAS", "build" ]'
+      runs-on: '[ "Windows", "NAS", "dg2" ]'
       project: embree
-      dpcpp-version: intel-llvm/nightly-2023-10-26-rk
-      artifact-out: windows-DG2-JIT-INTERNAL-L0RTAS-build
+      env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-public.env
+      artifact-out: nightly-windows-DG2-MULTILEVEL-build
       artifact-path: ./build/*.zip
       cmd: |
-        cmake --preset windows-DG2-JIT-INTERNAL-L0RTAS -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=3
+        cmake --preset nightly-windows-DG2-MULTILEVEL -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=2
         cmake --build build --config Release --target build
 
-  windows-DG2-JIT-INTERNAL-L0RTAS-test:
+  nightly-windows-DG2-MULTILEVEL-test:
     secrets: inherit
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main
-    needs: ["windows-DG2-JIT-INTERNAL-L0RTAS-build"]
+    needs: ["nightly-windows-DG2-MULTILEVEL-build"]
     with:
       runs-on: '[ "Windows", "NAS", "dg2" ]'
       project: embree
-      env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-internal.env
-      artifact-in: windows-DG2-JIT-INTERNAL-L0RTAS-build
+      env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-public.env
+      artifact-in: nightly-windows-DG2-MULTILEVEL-build
       cmd: |
-        cmake --preset windows-DG2-JIT-INTERNAL-L0RTAS -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=3
+        cmake --preset nightly-windows-DG2-MULTILEVEL -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=2
         cmake --build build --config Release --target test_package
 
   ################################################################################

.gitignore

@@ -9,4 +9,5 @@ kernels/config.h
 kernels/hash.h
 include/embree4/rtcore_config.h
 build
+build*
 out

CMakeLists.txt

@@ -146,6 +146,7 @@ OPTION(EMBREE_STACK_PROTECTOR "When enabled Embree compiles with stack protectio
 IF (NOT APPLE)
   OPTION(EMBREE_SYCL_SUPPORT "Enables SYCL GPU support." OFF)
 ENDIF()
+CMAKE_DEPENDENT_OPTION(EMBREE_SYCL_BVH_DATA_HOST_DEVICE "Enables BVH data in explicit host/device memory mode. Requires driver fix. Turned off until driver fix publicly available." OFF "EMBREE_SYCL_SUPPORT" OFF)
 CMAKE_DEPENDENT_OPTION(EMBREE_SYCL_LARGEGRF "Enables SYCL large GRF support." OFF "EMBREE_SYCL_SUPPORT" OFF)
 CMAKE_DEPENDENT_OPTION(EMBREE_SYCL_DBG "Enables DPC++ debug info." OFF "EMBREE_SYCL_SUPPORT" OFF)
 CMAKE_DEPENDENT_OPTION(EMBREE_SYCL_GEOMETRY_CALLBACK  "Enabled geometry callbacks which are disabled by default for SYCL." OFF  "EMBREE_SYCL_SUPPORT" OFF)
@@ -194,11 +195,6 @@ IF (EMBREE_SYCL_SUPPORT)
   ENDIF()
 ENDIF()
 
-CMAKE_DEPENDENT_OPTION(EMBREE_SYCL_L0_RTAS_BUILDER "Enable Level Zero RTAS builder" ON "EMBREE_SYCL_SUPPORT" OFF)
-IF (EMBREE_SYCL_L0_RTAS_BUILDER)
-  ADD_DEFINITIONS("-DEMBREE_SYCL_L0_RTAS_BUILDER")
-ENDIF()
-
 OPTION(EMBREE_RAY_MASK "Enables ray mask support." ON)
 OPTION(EMBREE_BACKFACE_CULLING "Enables backface culling.")
 OPTION(EMBREE_BACKFACE_CULLING_CURVES "Enables backface culling for curve primitives." OFF)

CMakePresets.json

@@ -40,7 +40,6 @@
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Release",
         "EMBREE_SYCL_SUPPORT": "ON",
-        "EMBREE_SYCL_L0_RTAS_BUILDER" : "OFF",
         "EMBREE_SYCL_AOT_DEVICES": "none",
         "EMBREE_MAX_ISA": "AVX512",
         "EMBREE_USE_GOOGLE_BENCHMARK": "ON",
@@ -83,7 +82,6 @@
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Release",
         "EMBREE_SYCL_SUPPORT": "ON",
-        "EMBREE_SYCL_L0_RTAS_BUILDER" : "OFF",
         "EMBREE_SYCL_AOT_DEVICES": "none",
         "EMBREE_MAX_ISA": "AVX512"
       }

common/math/vec3fa_sycl.h

@@ -614,4 +614,12 @@ namespace embree
 
   //__forceinline Vec3ia::Vec3ia( const Vec3fx& a )
   //  : x((int)a.x), y((int)a.y), z((int)a.z) {}
+
+}
+
+#if __SYCL_COMPILER_VERSION >= 20210801
+namespace sycl {
+  template<> struct is_device_copyable<embree::Vec3fa> : std::true_type {};
+  template<> struct is_device_copyable<const embree::Vec3fa> : std::true_type {};
 }
+#endif