From 9afc29bf840b2f1f7eed61be1721062e88adcc30 Mon Sep 17 00:00:00 2001
From: Pavel V Chupin <pavel.v.chupin@intel.com>
Date: Wed, 25 May 2022 17:00:37 -0700
Subject: [PATCH 1/2] [CI] Enable llvm-test-suite on CUDA Linux target

* Updating reusable workflow with corresponding config
* Fix option typo
---
 .github/workflows/sycl_linux_build_and_test.yml   |  4 ++++
 .github/workflows/sycl_precommit.yml              |  2 +-
 .github/workflows/sycl_windows_build_and_test.yml |  2 +-
 devops/test_configs.json                          | 12 ++++++++++++
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/sycl_linux_build_and_test.yml b/.github/workflows/sycl_linux_build_and_test.yml
index 0241ac982de66..6ed1bfe566333 100644
--- a/.github/workflows/sycl_linux_build_and_test.yml
+++ b/.github/workflows/sycl_linux_build_and_test.yml
@@ -52,6 +52,10 @@ on:
         type: string
         required: false
         default: "ghcr.io/intel/llvm/ubuntu2004_build:latest"
+      cuda_image:
+        type: string
+        required: false
+        default: "ghcr.io/intel/llvm/ubuntu2004_build:latest"
       lts_ref:
         type: string
         required: false
diff --git a/.github/workflows/sycl_precommit.yml b/.github/workflows/sycl_precommit.yml
index b7ce83fccdc3f..3417cdee09d8f 100644
--- a/.github/workflows/sycl_precommit.yml
+++ b/.github/workflows/sycl_precommit.yml
@@ -41,4 +41,4 @@ jobs:
       build_cache_size: "8G"
       build_artifact_suffix: "default"
       build_cache_suffix: "default"
-      lts_config: "hip_amdgpu;ocl_x64;ocl_gen9;l0_gen9;esimd_emu"
+      lts_config: "cuda"  ## TEMPORARY CHANGE - ROLLBACK BEFORE MERGE
diff --git a/.github/workflows/sycl_windows_build_and_test.yml b/.github/workflows/sycl_windows_build_and_test.yml
index afa0b50cffc71..bb2f534a68604 100644
--- a/.github/workflows/sycl_windows_build_and_test.yml
+++ b/.github/workflows/sycl_windows_build_and_test.yml
@@ -38,7 +38,7 @@ jobs:
         IF NOT EXIST D:\github\_work\cache MKDIR D:\github\_work\cache
         IF NOT EXIST D:\github\_work\cache\sycl_${{inputs.build_cache_suffix}} MKDIR D:\github\_work\cache\${{inputs.build_cache_suffix}}
         python.exe src/buildbot/configure.py -o build ^
-          --ci-default ^
+          --ci-defaults ^
           --cmake-opt="-DCMAKE_C_COMPILER=cl" ^
           --cmake-opt="-DCMAKE_CXX_COMPILER=cl" ^
           --cmake-opt="-DCMAKE_INSTALL_PREFIX=%GITHUB_WORKSPACE%\install" ^
diff --git a/devops/test_configs.json b/devops/test_configs.json
index d0a403cd0d153..a66d106163b39 100644
--- a/devops/test_configs.json
+++ b/devops/test_configs.json
@@ -59,6 +59,18 @@
       "container_options": "--device=/dev/dri --device=/dev/kfd",
       "check_sycl_all": "hip:gpu,host",
       "cmake_args": "-DHIP_PLATFORM=\"AMD\" -DAMD_ARCH=\"gfx1031\""
+    },
+    {
+      "config": "cuda",
+      "name": "CUDA LLVM Test Suite",
+      "runs-on": [
+        "Linux",
+        "cuda"
+      ],
+      "image": "${{ inputs.cuda_image }}",
+      "container_options": "--gpus all",
+      "check_sycl_all": "cuda:gpu,host",
+      "cmake_args": ""
     }
   ]
 }

From 349d415fdb90244d5b2b1aec0e72b96765dbbdf3 Mon Sep 17 00:00:00 2001
From: Pavel V Chupin <pavel.v.chupin@intel.com>
Date: Wed, 8 Jun 2022 13:54:04 -0700
Subject: [PATCH 2/2] Add cuda to precommit

---
 .github/workflows/sycl_precommit.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/sycl_precommit.yml b/.github/workflows/sycl_precommit.yml
index 3417cdee09d8f..374f930d00cea 100644
--- a/.github/workflows/sycl_precommit.yml
+++ b/.github/workflows/sycl_precommit.yml
@@ -41,4 +41,4 @@ jobs:
       build_cache_size: "8G"
       build_artifact_suffix: "default"
       build_cache_suffix: "default"
-      lts_config: "cuda"  ## TEMPORARY CHANGE - ROLLBACK BEFORE MERGE
+      lts_config: "hip_amdgpu;ocl_x64;ocl_gen9;l0_gen9;esimd_emu;cuda"