Restoring extra TBB registry key to fix dpcpp failure with caching (#64)

Author: mmzakhar

.azure-pipelines.yml

@@ -42,6 +42,8 @@ variables:
     value: 2022.3.0
   - name: COMPILER_VERSION
     value: 2022.2.1
+  - name: TBB_VERSION
+    value: 2021.7.1
   - name: VS_VER
     value: vs2022
 
@@ -181,7 +183,7 @@ jobs:
   - script: scripts/install_windows.bat $(WINDOWS_BASEKIT_URL) $(WINDOWS_DPCPP_COMPONENTS)
     displayName: install
     condition: ne(variables.CACHE_RESTORED, 'true')
-  - script: scripts/restore_registry.bat $(COMPILER_VERSION)
+  - script: scripts/restore_registry.bat $(COMPILER_VERSION) $(TBB_VERSION)
     displayName: restory registry on cache hit
     condition: eq(variables.CACHE_RESTORED, 'true')
   - bash: cp vcvarsall/setvars-vcvarsall.bat "C:/Program Files (x86)/Intel/oneAPI/"

.circleci/config.yml

@@ -49,6 +49,9 @@ parameters:
   COMPILER_VERSION:
     type: string
     default: "2022.2.1"
+  TBB_VERSION:
+    type: string
+    default: "2021.7.1"
   VS_VER:
     type: string
     default: "vs2017"
@@ -140,7 +143,7 @@ jobs:
           name: restory registry on cache hit
           command: |
             [ ! -d "C:\Program Files (x86)\Intel\oneAPI\compiler" ] && exit 0
-            scripts/restore_registry.bat << pipeline.parameters.COMPILER_VERSION >>
+            scripts/restore_registry.bat << pipeline.parameters.COMPILER_VERSION >> << pipeline.parameters.TBB_VERSION >>
       - run:
           name: install
           command: |

.github/workflows/build_all.yml

@@ -26,6 +26,7 @@ env:
   CACHE_NUMBER: 4
   SAMPLES_TAG: 2022.3.0
   COMPILER_VERSION: 2022.2.1
+  TBB_VERSION: 2021.7.1
   VS_VER: vs2022
 
 jobs:
@@ -125,7 +126,7 @@ jobs:
       run: scripts/install_windows.bat $WINDOWS_BASEKIT_URL $WINDOWS_DPCPP_COMPONENTS
     - name: restore registry on cache hit
       if: steps.cache-install.outputs.cache-hit == 'true'
-      run: scripts/restore_registry.bat $COMPILER_VERSION
+      run: scripts/restore_registry.bat $COMPILER_VERSION $TBB_VERSION
     - name: build
       run: scripts/build_windows.bat dpc++ $VS_VER $SAMPLES_TAG
     - name: exclude unused files from cache

.gitlab-ci.yml

@@ -21,7 +21,8 @@ variables:
   LINUX_DPCPP_COMPONENTS_WEB: intel.oneapi.lin.dpcpp-cpp-compiler
   CACHE_NUMBER: 10
   SAMPLES_TAG: 2022.3.0
-  COMPILER_VERSION: "2022.2"
+  COMPILER_VERSION: "2022.2.1"
+  TBB_VERSION: "2021.7.1"
   VS_VER: 2019_build_tools
 
 .shared_windows_runners:
@@ -131,7 +132,7 @@ build_windows_dpcpp:
           Move-Item -Path cache\tbb -Destination "C:\Program Files (x86)\Intel\oneAPI"
           Move-Item -Path cache\OpenCL.dll -Destination "C:\Windows\System32"
           Move-Item -Path cache\setvars-vcvarsall.bat -Destination "C:\Program Files (x86)\Intel\oneAPI\setvars-vcvarsall.bat"
-          scripts/restore_registry.bat $COMPILER_VERSION
+          scripts/restore_registry.bat $COMPILER_VERSION $TBB_VERSION
         } else {
           scripts/install_windows.bat $WINDOWS_BASEKIT_URL $WINDOWS_DPCPP_COMPONENTS
         }

scripts/restore_registry.bat

@@ -3,5 +3,7 @@ REM
 REM SPDX-License-Identifier: MIT
 
 set COMPILER_VERSION=%1
+set TBB_VERSION=%2
 
 reg add HKLM\Software\Khronos\OpenCL\Vendors /v "C:\Program Files (x86)\Intel\oneAPI\compiler\%COMPILER_VERSION%\windows\lib\x64\intelocl64.dll" /t REG_DWORD /d 0 /f
+reg add HKLM\Software\Intel\oneAPI\TBB\%TBB_VERSION% /v TBB_DLL_PATH /t REG_SZ /d "C:\Program Files (x86)\Intel\oneAPI\tbb\%TBB_VERSION%\redist\intel64\vc14" /f