From a85bef19a783db1ef3d3949a9e90d0f2569f02b8 Mon Sep 17 00:00:00 2001
From: Sergey Kanaev <sergey.kanaev@intel.com>
Date: Mon, 25 Oct 2021 11:30:08 +0300
Subject: [PATCH 1/7] [SYCL] Update tests for disabling fallback assert feature
 on FPGA device

Signed-off-by: Sergey Kanaev <sergey.kanaev@intel.com>
---
 SYCL/Assert/assert_in_kernels.cpp                      |  8 ++++++--
 SYCL/Assert/assert_in_kernels_win.cpp                  | 10 +++++++---
 SYCL/Assert/assert_in_multiple_tus.cpp                 |  8 ++++++--
 SYCL/Assert/assert_in_multiple_tus_one_ndebug.cpp      |  8 ++++++--
 SYCL/Assert/assert_in_multiple_tus_one_ndebug_win.cpp  |  8 ++++++--
 SYCL/Assert/assert_in_multiple_tus_win.cpp             | 10 +++++++---
 SYCL/Assert/assert_in_one_kernel.cpp                   |  8 ++++++--
 SYCL/Assert/assert_in_one_kernel_win.cpp               | 10 +++++++---
 SYCL/Assert/assert_in_simultaneous_kernels.cpp         |  8 ++++++--
 SYCL/Assert/assert_in_simultaneous_kernels_win.cpp     | 10 +++++++---
 SYCL/Assert/assert_in_simultaneously_multiple_tus.cpp  |  8 ++++++--
 ...ssert_in_simultaneously_multiple_tus_one_ndebug.cpp |  7 +++++--
 12 files changed, 75 insertions(+), 28 deletions(-)

diff --git a/SYCL/Assert/assert_in_kernels.cpp b/SYCL/Assert/assert_in_kernels.cpp
index 1e3e92f6ea..ed019b559e 100644
--- a/SYCL/Assert/assert_in_kernels.cpp
+++ b/SYCL/Assert/assert_in_kernels.cpp
@@ -6,13 +6,17 @@
 // RUN: %CPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
 // RUN: %GPU_RUN_PLACEHOLDER %t.out &> %t.txt || true
 // RUN: %GPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
-// RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.txt || true
-// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
+// Shouldn't fail on ACC as fallback assert isn't enqueued there
+// RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.txt
+// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --check-prefix=CHECK_ACC --input-file %t.txt
 //
 // CHECK-NOT:  One shouldn't see this message
 // CHECK:      {{.*}}assert_in_kernels.hpp:26: void kernelFunc2(int *, int): global id: [{{[0,2]}},0,0], local id: [0,0,0]
 // CHECK-SAME: Assertion `Buf[wiID] == 0 && "from assert statement"` failed.
 // CHECK-NOT:  test aborts earlier, one shouldn't see this message
 // CHECK-NOT:  The test ended.
+//
+// CHECK_ACC-NOT: {{.*}}assert_in_kernels.hpp:26: void kernelFunc2(int *, int): global id: [{{[0,2]}},0,0], local id: [0,0,0]
+// CHECK_ACC: The test ended.
 
 #include "assert_in_kernels.hpp"
diff --git a/SYCL/Assert/assert_in_kernels_win.cpp b/SYCL/Assert/assert_in_kernels_win.cpp
index 2d8d497083..05a42b5de1 100644
--- a/SYCL/Assert/assert_in_kernels_win.cpp
+++ b/SYCL/Assert/assert_in_kernels_win.cpp
@@ -4,15 +4,19 @@
 // RUN: %CPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
 // RUN: %GPU_RUN_PLACEHOLDER %t.out &> %t.txt || true
 // RUN: %GPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
-// RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.txt || true
-// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
+// Shouldn't fail on ACC as fallback assert isn't enqueued there
+// RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.txt
+// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --check-prefix=CHECK_ACC --input-file %t.txt
 //
 // CHECK-NOT:  One shouldn't see this message
-// FIXME Windows versionprints '(null)' instead of '<unknown func>' once in a
+// FIXME Windows version prints '(null)' instead of '<unknown func>' once in a
 // while for some insane reason.
 // CHECK:      {{.*}}assert_in_kernels.hpp:26: {{<unknown func>|(null)}}: global id: [{{[0,2]}},0,0], local id: [0,0,0]
 // CHECK-SAME: Assertion `Buf[wiID] == 0 && "from assert statement"` failed.
 // CHECK-NOT:  test aborts earlier, one shouldn't see this message
 // CHECK-NOT:  The test ended.
+//
+// CHECK_ACC-NOT: {{.*}}assert_in_kernels.hpp:26: {{<unknown func>|(null)}}: global id: [{{[0,2]}},0,0], local id: [0,0,0]
+// CHECK_ACC: The test ended.
 
 #include "assert_in_kernels.hpp"
diff --git a/SYCL/Assert/assert_in_multiple_tus.cpp b/SYCL/Assert/assert_in_multiple_tus.cpp
index 40c9a87fb3..b29d2dcca0 100644
--- a/SYCL/Assert/assert_in_multiple_tus.cpp
+++ b/SYCL/Assert/assert_in_multiple_tus.cpp
@@ -6,12 +6,16 @@
 // RUN: %CPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
 // RUN: %GPU_RUN_PLACEHOLDER %t.out &> %t.txt || true
 // RUN: %GPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
-// RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.txt || true
-// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
+// Shouldn't fail on ACC as fallback assert isn't enqueued there
+// RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.txt
+// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --check-prefix=CHECK_ACC --input-file %t.txt
 //
 // CHECK:      {{.*}}kernels_in_file2.cpp:15: int calculus(int): global id: [5,0,0], local id: [1,0,0]
 // CHECK-SAME: Assertion `X && "this message from calculus"` failed.
 // CHECK-NOT:  this message from file2
 // CHECK-NOT:  The test ended.
+//
+// CHECK_ACC-NOT: {{.*}}kernels_in_file2.cpp:15: int calculus(int): global id: [5,0,0], local id: [1,0,0]
+// CHECK_ACC: The test ended.
 
 #include "assert_in_multiple_tus.hpp"
diff --git a/SYCL/Assert/assert_in_multiple_tus_one_ndebug.cpp b/SYCL/Assert/assert_in_multiple_tus_one_ndebug.cpp
index d8b6aa4597..c04ca5a607 100644
--- a/SYCL/Assert/assert_in_multiple_tus_one_ndebug.cpp
+++ b/SYCL/Assert/assert_in_multiple_tus_one_ndebug.cpp
@@ -6,11 +6,15 @@
 // RUN: %CPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
 // RUN: %GPU_RUN_PLACEHOLDER %t.out &> %t.txt || true
 // RUN: %GPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
-// RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.txt || true
-// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
+// Shouldn't fail on ACC as fallback assert isn't enqueued there
+// RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.txt
+// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --check-prefix=CHECK_ACC --input-file %t.txt
 //
 // CHECK-NOT:  this message from calculus
 // CHECK:      {{.*}}assert_in_multiple_tus.hpp:20: int checkFunction(): global id: [5,0,0],
 // CHECK-SAME: local id: [1,0,0] Assertion `X && "Nil in result"` failed.
 // CHECK-NOT:  this message from file2
 // CHECK-NOT:  The test ended.
+//
+// CHECK_ACC-NOT: {{.*}}assert_in_multiple_tus.hpp:20: int checkFunction(): global id: [5,0,0],
+// CHECK_ACC: The test ended.
diff --git a/SYCL/Assert/assert_in_multiple_tus_one_ndebug_win.cpp b/SYCL/Assert/assert_in_multiple_tus_one_ndebug_win.cpp
index 217ebd074a..dc6db63118 100644
--- a/SYCL/Assert/assert_in_multiple_tus_one_ndebug_win.cpp
+++ b/SYCL/Assert/assert_in_multiple_tus_one_ndebug_win.cpp
@@ -4,13 +4,17 @@
 // RUN: %CPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
 // RUN: %GPU_RUN_PLACEHOLDER %t.out &> %t.txt || true
 // RUN: %GPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
+// Shouldn't fail on ACC as fallback assert isn't enqueued there
 // RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.txt || true
-// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
+// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --check-prefix=CHECK_ACC --input-file %t.txt
 //
 // CHECK-NOT:  this message from calculus
-// FIXME Windows versionprints '(null)' instead of '<unknown func>' once in a
+// FIXME Windows version prints '(null)' instead of '<unknown func>' once in a
 // while for some insane reason.
 // CHECK:      {{.*}}assert_in_multiple_tus.hpp:20: {{<unknown func>|(null)}}: global id: [5,0,0],
 // CHECK-SAME: local id: [1,0,0] Assertion `X && "Nil in result"` failed.
 // CHECK-NOT:  this message from file2
 // CHECK-NOT:  The test ended.
+//
+// CHECK_ACC-NOT: {{.*}}assert_in_multiple_tus.hpp:20: {{<unknown func>|(null)}}: global id: [5,0,0],
+// CHECK_ACC: The test ended.
diff --git a/SYCL/Assert/assert_in_multiple_tus_win.cpp b/SYCL/Assert/assert_in_multiple_tus_win.cpp
index 1eb5f823cb..b0a27ad986 100644
--- a/SYCL/Assert/assert_in_multiple_tus_win.cpp
+++ b/SYCL/Assert/assert_in_multiple_tus_win.cpp
@@ -4,14 +4,18 @@
 // RUN: %CPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
 // RUN: %GPU_RUN_PLACEHOLDER %t.out &> %t.txt || true
 // RUN: %GPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
-// RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.txt || true
-// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
+// Shouldn't fail on ACC as fallback assert isn't enqueued there
+// RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.txt
+// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --check-prefix=CHECK_ACC --input-file %t.txt
 //
-// FIXME Windows versionprints '(null)' instead of '<unknown func>' once in a
+// FIXME Windows version prints '(null)' instead of '<unknown func>' once in a
 // while for some insane reason.
 // CHECK:      {{.*}}kernels_in_file2.cpp:15: {{<unknown func>|(null)}}: global id: [5,0,0], local id: [1,0,0]
 // CHECK-SAME: Assertion `X && "this message from calculus"` failed.
 // CHECK-NOT:  this message from file2
 // CHECK-NOT:  The test ended.
+//
+// CHECK_ACC-NOT: {{.*}}kernels_in_file2.cpp:15: {{<unknown func>|(null)}}: global id: [5,0,0], local id: [1,0,0]
+// CHECK_ACC: The test ended.
 
 #include "assert_in_multiple_tus.hpp"
diff --git a/SYCL/Assert/assert_in_one_kernel.cpp b/SYCL/Assert/assert_in_one_kernel.cpp
index d56dafff9b..60294a89fc 100644
--- a/SYCL/Assert/assert_in_one_kernel.cpp
+++ b/SYCL/Assert/assert_in_one_kernel.cpp
@@ -6,11 +6,15 @@
 // RUN: %CPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
 // RUN: %GPU_RUN_PLACEHOLDER %t.out &> %t.txt || true
 // RUN: %GPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
-// RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.txt || true
-// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
+// Shouldn't fail on ACC as fallback assert isn't enqueued there
+// RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.txt
+// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --check-prefix=CHECK_ACC --input-file %t.txt
 //
 // CHECK:      {{.*}}assert_in_one_kernel.hpp:10: void kernelFunc(int *, int): global id: [{{[0-3]}},0,0], local id: [0,0,0]
 // CHECK-SAME: Assertion `Buf[wiID] != 0 && "from assert statement"` failed.
 // CHECK-NOT:  The test ended.
+//
+// CHECK_ACC-NOT: {{.*}}assert_in_one_kernel.hpp:10: void kernelFunc(int *, int): global id: [{{[0-3]}},0,0], local id: [0,0,0]
+// CHECK_ACC: The test ended.
 
 #include "assert_in_one_kernel.hpp"
diff --git a/SYCL/Assert/assert_in_one_kernel_win.cpp b/SYCL/Assert/assert_in_one_kernel_win.cpp
index 2d1970521b..483806eefe 100644
--- a/SYCL/Assert/assert_in_one_kernel_win.cpp
+++ b/SYCL/Assert/assert_in_one_kernel_win.cpp
@@ -4,13 +4,17 @@
 // RUN: %CPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
 // RUN: %GPU_RUN_PLACEHOLDER %t.out &> %t.txt || true
 // RUN: %GPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
-// RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.txt || true
-// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
+// Shouldn't fail on ACC as fallback assert isn't enqueued there
+// RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.txt
+// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --check-prefix=CHECK_ACC --input-file %t.txt
 //
-// FIXME Windows versionprints '(null)' instead of '<unknown func>' once in a
+// FIXME Windows version prints '(null)' instead of '<unknown func>' once in a
 // while for some insane reason.
 // CHECK:      {{.*}}assert_in_one_kernel.hpp:10: {{<unknown func>|(null)}}: global id: [{{[0-3]}},0,0], local id: [0,0,0]
 // CHECK-SAME: Assertion `Buf[wiID] != 0 && "from assert statement"` failed.
 // CHECK-NOT:  The test ended.
+//
+// CHECK_ACC-NOT: {{.*}}assert_in_one_kernel.hpp:10: {{<unknown func>|(null)}}: global id: [{{[0-3]}},0,0], local id: [0,0,0]
+// CHECK_ACC:  The test ended.
 
 #include "assert_in_one_kernel.hpp"
diff --git a/SYCL/Assert/assert_in_simultaneous_kernels.cpp b/SYCL/Assert/assert_in_simultaneous_kernels.cpp
index b439611b41..baf477c0e9 100644
--- a/SYCL/Assert/assert_in_simultaneous_kernels.cpp
+++ b/SYCL/Assert/assert_in_simultaneous_kernels.cpp
@@ -6,11 +6,15 @@
 // RUN: %CPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
 // RUN: %GPU_RUN_PLACEHOLDER %t.out &> %t.txt || true
 // RUN: %GPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
-// RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.txt || true
-// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
+// Shouldn't fail on ACC as fallback assert isn't enqueued there
+// RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.txt
+// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --check-prefix=CHECK_ACC --input-file %t.txt
 //
 // CHECK:      {{.*}}assert_in_simultaneous_kernels.hpp:12: void assertFunc(): global id: [9,7,0], local id: [0,0,0]
 // CHECK-SAME: Assertion `false && "from assert statement"` failed.
 // CHECK-NOT:  The test ended.
+//
+// CHECK_ACC-NOT: {{.*}}assert_in_simultaneous_kernels.hpp:12: void assertFunc(): global id: [9,7,0], local id: [0,0,0]
+// CHECK_ACC: The test ended.
 
 #include "assert_in_simultaneous_kernels.hpp"
diff --git a/SYCL/Assert/assert_in_simultaneous_kernels_win.cpp b/SYCL/Assert/assert_in_simultaneous_kernels_win.cpp
index b027221077..f868d958ec 100644
--- a/SYCL/Assert/assert_in_simultaneous_kernels_win.cpp
+++ b/SYCL/Assert/assert_in_simultaneous_kernels_win.cpp
@@ -4,13 +4,17 @@
 // RUN: %CPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
 // RUN: %GPU_RUN_PLACEHOLDER %t.out &> %t.txt || true
 // RUN: %GPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
-// RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.txt || true
-// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
+// Shouldn't fail on ACC as fallback assert isn't enqueued there
+// RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.txt
+// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --check-prefix=CHECK_ACC --input-file %t.txt
 //
-// FIXME Windows versionprints '(null)' instead of '<unknown func>' once in a
+// FIXME Windows version prints '(null)' instead of '<unknown func>' once in a
 // while for some insane reason.
 // CHECK:      {{.*}}assert_in_simultaneous_kernels.hpp:12: {{<unknown func>|(null)}}: global id: [9,7,0], local id: [0,0,0]
 // CHECK-SAME: Assertion `false && "from assert statement"` failed.
 // CHECK-NOT:  The test ended.
+//
+// CHECK_ACC-NOT: {{.*}}assert_in_simultaneous_kernels.hpp:12: {{<unknown func>|(null)}}: global id: [9,7,0], local id: [0,0,0]
+// CHECK_ACC:  The test ended.
 
 #include "assert_in_simultaneous_kernels.hpp"
diff --git a/SYCL/Assert/assert_in_simultaneously_multiple_tus.cpp b/SYCL/Assert/assert_in_simultaneously_multiple_tus.cpp
index f7896b39aa..2e8f60496a 100644
--- a/SYCL/Assert/assert_in_simultaneously_multiple_tus.cpp
+++ b/SYCL/Assert/assert_in_simultaneously_multiple_tus.cpp
@@ -5,11 +5,15 @@
 // RUN: %CPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
 // RUN: %GPU_RUN_PLACEHOLDER %t.out &> %t.txt || true
 // RUN: %GPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
-// RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.txt || true
-// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
+// Shouldn't fail on ACC as fallback assert isn't enqueued there
+// RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.txt
+// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --check-prefix=CHECK_ACC --input-file %t.txt
 //
 // CHECK:      {{this message from file1|this message from file2}}
 // CHECK-NOT:  The test ended.
+//
+// CHECK_ACC-NOT: {{this message from file1|this message from file2}}
+// CHECK_ACC: The test ended.
 
 #include "Inputs/kernels_in_file2.hpp"
 #include <CL/sycl.hpp>
diff --git a/SYCL/Assert/assert_in_simultaneously_multiple_tus_one_ndebug.cpp b/SYCL/Assert/assert_in_simultaneously_multiple_tus_one_ndebug.cpp
index 3dc45bb18c..c6453a28d6 100644
--- a/SYCL/Assert/assert_in_simultaneously_multiple_tus_one_ndebug.cpp
+++ b/SYCL/Assert/assert_in_simultaneously_multiple_tus_one_ndebug.cpp
@@ -5,9 +5,12 @@
 // RUN: %CPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
 // RUN: %GPU_RUN_PLACEHOLDER %t.out &> %t.txt || true
 // RUN: %GPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
-// RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.txt || true
-// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
+// Shouldn't fail on ACC as fallback assert isn't enqueued there
+// RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.txt
+// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --check-prefix=CHECK_ACC --input-file %t.txt
 //
 // CHECK:      this message from file1
 // CHECK-NOT:  this message from file2
 // CHECK-NOT:  The test ended.
+//
+// CHECK_ACC: The test ended.

From 6c5901d5526ec496b59381445c60be390ed6e295 Mon Sep 17 00:00:00 2001
From: Sergey Kanaev <sergey.kanaev@intel.com>
Date: Mon, 25 Oct 2021 15:18:18 +0300
Subject: [PATCH 2/7] Try to address clang format issues

Signed-off-by: Sergey Kanaev <sergey.kanaev@intel.com>
---
 SYCL/.clang-format | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SYCL/.clang-format b/SYCL/.clang-format
index 0fb3ce609e..e9981e660d 100644
--- a/SYCL/.clang-format
+++ b/SYCL/.clang-format
@@ -1,2 +1,2 @@
 BasedOnStyle: LLVM
-CommentPragmas: "(RUN|FAIL|REQUIRES|UNSUPPORTED|CHECK) *:|expected-"
+CommentPragmas: "(RUN|FAIL|REQUIRES|UNSUPPORTED|CHECK|CHECK[-_][A-Za-z0-9]\+) *:|expected-"

From e46edf8c59fe7197240bc1235ed666aebd0abb15 Mon Sep 17 00:00:00 2001
From: Sergey Kanaev <sergey.kanaev@intel.com>
Date: Tue, 26 Oct 2021 16:33:54 +0300
Subject: [PATCH 3/7] Make windows tests usupported for CUDA and HIP

Signed-off-by: Sergey Kanaev <sergey.kanaev@intel.com>
---
 SYCL/Assert/assert_in_kernels_win.cpp                 | 1 +
 SYCL/Assert/assert_in_multiple_tus_one_ndebug_win.cpp | 1 +
 SYCL/Assert/assert_in_multiple_tus_win.cpp            | 1 +
 SYCL/Assert/assert_in_one_kernel_win.cpp              | 1 +
 SYCL/Assert/assert_in_simultaneous_kernels_win.cpp    | 1 +
 5 files changed, 5 insertions(+)

diff --git a/SYCL/Assert/assert_in_kernels_win.cpp b/SYCL/Assert/assert_in_kernels_win.cpp
index 05a42b5de1..4ce9918d16 100644
--- a/SYCL/Assert/assert_in_kernels_win.cpp
+++ b/SYCL/Assert/assert_in_kernels_win.cpp
@@ -1,4 +1,5 @@
 // REQUIRES: windows
+// UNSUPPORTED: cuda || hip
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out &> %t.txt || true
 // RUN: %CPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
diff --git a/SYCL/Assert/assert_in_multiple_tus_one_ndebug_win.cpp b/SYCL/Assert/assert_in_multiple_tus_one_ndebug_win.cpp
index dc6db63118..bd67574ba3 100644
--- a/SYCL/Assert/assert_in_multiple_tus_one_ndebug_win.cpp
+++ b/SYCL/Assert/assert_in_multiple_tus_one_ndebug_win.cpp
@@ -1,4 +1,5 @@
 // REQUIRES: windows
+// UNSUPPORTED: cuda || hip
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -DDEFINE_NDEBUG_INFILE2 -I %S/Inputs %S/assert_in_multiple_tus.cpp %S/Inputs/kernels_in_file2.cpp -o %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out &> %t.txt || true
 // RUN: %CPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
diff --git a/SYCL/Assert/assert_in_multiple_tus_win.cpp b/SYCL/Assert/assert_in_multiple_tus_win.cpp
index b0a27ad986..34fa1b3c67 100644
--- a/SYCL/Assert/assert_in_multiple_tus_win.cpp
+++ b/SYCL/Assert/assert_in_multiple_tus_win.cpp
@@ -1,4 +1,5 @@
 // REQUIRES: windows
+// UNSUPPORTED: cuda || hip
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -I %S/Inputs %s %S/Inputs/kernels_in_file2.cpp -o %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out &> %t.txt || true
 // RUN: %CPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
diff --git a/SYCL/Assert/assert_in_one_kernel_win.cpp b/SYCL/Assert/assert_in_one_kernel_win.cpp
index 483806eefe..f6318a68d7 100644
--- a/SYCL/Assert/assert_in_one_kernel_win.cpp
+++ b/SYCL/Assert/assert_in_one_kernel_win.cpp
@@ -1,4 +1,5 @@
 // REQUIRES: windows
+// UNSUPPORTED: cuda || hip
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out &> %t.txt || true
 // RUN: %CPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
diff --git a/SYCL/Assert/assert_in_simultaneous_kernels_win.cpp b/SYCL/Assert/assert_in_simultaneous_kernels_win.cpp
index f868d958ec..bca04ba293 100644
--- a/SYCL/Assert/assert_in_simultaneous_kernels_win.cpp
+++ b/SYCL/Assert/assert_in_simultaneous_kernels_win.cpp
@@ -1,4 +1,5 @@
 // REQUIRES: windows
+// UNSUPPORTED: cuda || hip
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out %threads_lib
 // RUN: %CPU_RUN_PLACEHOLDER %t.out &> %t.txt || true
 // RUN: %CPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt

From 1564c5978cc0128f85f06c4b945897746b213ef9 Mon Sep 17 00:00:00 2001
From: Sergey Kanaev <sergey.kanaev@intel.com>
Date: Tue, 26 Oct 2021 17:06:14 +0300
Subject: [PATCH 4/7] Fix clang-format

Signed-off-by: Sergey Kanaev <sergey.kanaev@intel.com>
---
 SYCL/.clang-format | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SYCL/.clang-format b/SYCL/.clang-format
index e9981e660d..bbe378509c 100644
--- a/SYCL/.clang-format
+++ b/SYCL/.clang-format
@@ -1,2 +1,2 @@
 BasedOnStyle: LLVM
-CommentPragmas: "(RUN|FAIL|REQUIRES|UNSUPPORTED|CHECK|CHECK[-_][A-Za-z0-9]\+) *:|expected-"
+CommentPragmas: "(RUN|FAIL|REQUIRES|UNSUPPORTED|CHECK|CHECK[-_][A-Za-z0-9]+) *:|expected-"

From bb2c1200faa1ed5677363978f5d258a8272681b8 Mon Sep 17 00:00:00 2001
From: Sergey Kanaev <sergey.kanaev@intel.com>
Date: Wed, 3 Nov 2021 16:12:10 +0300
Subject: [PATCH 5/7] Rename CHECK_ACC => CHECK-ACC

Signed-off-by: Sergey Kanaev <sergey.kanaev@intel.com>
---
 SYCL/Assert/assert_in_kernels.cpp                           | 6 +++---
 SYCL/Assert/assert_in_kernels_win.cpp                       | 6 +++---
 SYCL/Assert/assert_in_multiple_tus.cpp                      | 6 +++---
 SYCL/Assert/assert_in_multiple_tus_one_ndebug.cpp           | 6 +++---
 SYCL/Assert/assert_in_multiple_tus_one_ndebug_win.cpp       | 6 +++---
 SYCL/Assert/assert_in_multiple_tus_win.cpp                  | 6 +++---
 SYCL/Assert/assert_in_one_kernel.cpp                        | 6 +++---
 SYCL/Assert/assert_in_one_kernel_win.cpp                    | 6 +++---
 SYCL/Assert/assert_in_simultaneous_kernels.cpp              | 6 +++---
 SYCL/Assert/assert_in_simultaneous_kernels_win.cpp          | 6 +++---
 SYCL/Assert/assert_in_simultaneously_multiple_tus.cpp       | 6 +++---
 .../assert_in_simultaneously_multiple_tus_one_ndebug.cpp    | 4 ++--
 12 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/SYCL/Assert/assert_in_kernels.cpp b/SYCL/Assert/assert_in_kernels.cpp
index 36d58bed30..ae1d8a2d4e 100644
--- a/SYCL/Assert/assert_in_kernels.cpp
+++ b/SYCL/Assert/assert_in_kernels.cpp
@@ -8,7 +8,7 @@
 // RUN: %GPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
 // Shouldn't fail on ACC as fallback assert isn't enqueued there
 // RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.txt
-// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --check-prefix=CHECK_ACC --input-file %t.txt
+// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --check-prefix=CHECK-ACC --input-file %t.txt
 //
 // CHECK-NOT:  One shouldn't see this message
 // CHECK:      {{.*}}assert_in_kernels.hpp:26: void kernelFunc2(int *, int): global id: [{{[0,2]}},0,0], local id: [0,0,0]
@@ -16,7 +16,7 @@
 // CHECK-NOT:  test aborts earlier, one shouldn't see this message
 // CHECK-NOT:  The test ended.
 //
-// CHECK_ACC-NOT: {{.*}}assert_in_kernels.hpp:26: void kernelFunc2(int *, int): global id: [{{[0,2]}},0,0], local id: [0,0,0]
-// CHECK_ACC: The test ended.
+// CHECK-ACC-NOT: {{.*}}assert_in_kernels.hpp:26: void kernelFunc2(int *, int): global id: [{{[0,2]}},0,0], local id: [0,0,0]
+// CHECK-ACC: The test ended.
 
 #include "assert_in_kernels.hpp"
diff --git a/SYCL/Assert/assert_in_kernels_win.cpp b/SYCL/Assert/assert_in_kernels_win.cpp
index 7c46025476..f7c764e519 100644
--- a/SYCL/Assert/assert_in_kernels_win.cpp
+++ b/SYCL/Assert/assert_in_kernels_win.cpp
@@ -7,7 +7,7 @@
 // RUN: %GPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
 // Shouldn't fail on ACC as fallback assert isn't enqueued there
 // RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.txt
-// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --check-prefix=CHECK_ACC --input-file %t.txt
+// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --check-prefix=CHECK-ACC --input-file %t.txt
 //
 // CHECK-NOT:  One shouldn't see this message
 // FIXME Windows version prints '(null)' instead of '<unknown func>' once in a
@@ -17,7 +17,7 @@
 // CHECK-NOT:  test aborts earlier, one shouldn't see this message
 // CHECK-NOT:  The test ended.
 //
-// CHECK_ACC-NOT: {{.*}}assert_in_kernels.hpp:26: {{<unknown func>|(null)}}: global id: [{{[0,2]}},0,0], local id: [0,0,0]
-// CHECK_ACC: The test ended.
+// CHECK-ACC-NOT: {{.*}}assert_in_kernels.hpp:26: {{<unknown func>|(null)}}: global id: [{{[0,2]}},0,0], local id: [0,0,0]
+// CHECK-ACC: The test ended.
 
 #include "assert_in_kernels.hpp"
diff --git a/SYCL/Assert/assert_in_multiple_tus.cpp b/SYCL/Assert/assert_in_multiple_tus.cpp
index b4f81e1cc9..6e21e73304 100644
--- a/SYCL/Assert/assert_in_multiple_tus.cpp
+++ b/SYCL/Assert/assert_in_multiple_tus.cpp
@@ -8,14 +8,14 @@
 // RUN: %GPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
 // Shouldn't fail on ACC as fallback assert isn't enqueued there
 // RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.txt
-// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --check-prefix=CHECK_ACC --input-file %t.txt
+// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --check-prefix=CHECK-ACC --input-file %t.txt
 //
 // CHECK:      {{.*}}kernels_in_file2.cpp:15: int calculus(int): global id: [5,0,0], local id: [1,0,0]
 // CHECK-SAME: Assertion `X && "this message from calculus"` failed.
 // CHECK-NOT:  this message from file2
 // CHECK-NOT:  The test ended.
 //
-// CHECK_ACC-NOT: {{.*}}kernels_in_file2.cpp:15: int calculus(int): global id: [5,0,0], local id: [1,0,0]
-// CHECK_ACC: The test ended.
+// CHECK-ACC-NOT: {{.*}}kernels_in_file2.cpp:15: int calculus(int): global id: [5,0,0], local id: [1,0,0]
+// CHECK-ACC: The test ended.
 
 #include "assert_in_multiple_tus.hpp"
diff --git a/SYCL/Assert/assert_in_multiple_tus_one_ndebug.cpp b/SYCL/Assert/assert_in_multiple_tus_one_ndebug.cpp
index 203441930a..881a24b3e4 100644
--- a/SYCL/Assert/assert_in_multiple_tus_one_ndebug.cpp
+++ b/SYCL/Assert/assert_in_multiple_tus_one_ndebug.cpp
@@ -8,7 +8,7 @@
 // RUN: %GPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
 // Shouldn't fail on ACC as fallback assert isn't enqueued there
 // RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.txt
-// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --check-prefix=CHECK_ACC --input-file %t.txt
+// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --check-prefix=CHECK-ACC --input-file %t.txt
 //
 // CHECK-NOT:  this message from calculus
 // CHECK:      {{.*}}assert_in_multiple_tus.hpp:20: int checkFunction(): global id: [5,0,0],
@@ -16,5 +16,5 @@
 // CHECK-NOT:  this message from file2
 // CHECK-NOT:  The test ended.
 //
-// CHECK_ACC-NOT: {{.*}}assert_in_multiple_tus.hpp:20: int checkFunction(): global id: [5,0,0],
-// CHECK_ACC: The test ended.
+// CHECK-ACC-NOT: {{.*}}assert_in_multiple_tus.hpp:20: int checkFunction(): global id: [5,0,0],
+// CHECK-ACC: The test ended.
diff --git a/SYCL/Assert/assert_in_multiple_tus_one_ndebug_win.cpp b/SYCL/Assert/assert_in_multiple_tus_one_ndebug_win.cpp
index 693d5a2bd4..a8ed4bc381 100644
--- a/SYCL/Assert/assert_in_multiple_tus_one_ndebug_win.cpp
+++ b/SYCL/Assert/assert_in_multiple_tus_one_ndebug_win.cpp
@@ -7,7 +7,7 @@
 // RUN: %GPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
 // Shouldn't fail on ACC as fallback assert isn't enqueued there
 // RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.txt || true
-// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --check-prefix=CHECK_ACC --input-file %t.txt
+// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --check-prefix=CHECK-ACC --input-file %t.txt
 //
 // CHECK-NOT:  this message from calculus
 // FIXME Windows version prints '(null)' instead of '<unknown func>' once in a
@@ -17,5 +17,5 @@
 // CHECK-NOT:  this message from file2
 // CHECK-NOT:  The test ended.
 //
-// CHECK_ACC-NOT: {{.*}}assert_in_multiple_tus.hpp:20: {{<unknown func>|(null)}}: global id: [5,0,0],
-// CHECK_ACC: The test ended.
+// CHECK-ACC-NOT: {{.*}}assert_in_multiple_tus.hpp:20: {{<unknown func>|(null)}}: global id: [5,0,0],
+// CHECK-ACC: The test ended.
diff --git a/SYCL/Assert/assert_in_multiple_tus_win.cpp b/SYCL/Assert/assert_in_multiple_tus_win.cpp
index 01cbebb8c7..b04fa4740c 100644
--- a/SYCL/Assert/assert_in_multiple_tus_win.cpp
+++ b/SYCL/Assert/assert_in_multiple_tus_win.cpp
@@ -7,7 +7,7 @@
 // RUN: %GPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
 // Shouldn't fail on ACC as fallback assert isn't enqueued there
 // RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.txt
-// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --check-prefix=CHECK_ACC --input-file %t.txt
+// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --check-prefix=CHECK-ACC --input-file %t.txt
 //
 // FIXME Windows version prints '(null)' instead of '<unknown func>' once in a
 // while for some insane reason.
@@ -16,7 +16,7 @@
 // CHECK-NOT:  this message from file2
 // CHECK-NOT:  The test ended.
 //
-// CHECK_ACC-NOT: {{.*}}kernels_in_file2.cpp:15: {{<unknown func>|(null)}}: global id: [5,0,0], local id: [1,0,0]
-// CHECK_ACC: The test ended.
+// CHECK-ACC-NOT: {{.*}}kernels_in_file2.cpp:15: {{<unknown func>|(null)}}: global id: [5,0,0], local id: [1,0,0]
+// CHECK-ACC: The test ended.
 
 #include "assert_in_multiple_tus.hpp"
diff --git a/SYCL/Assert/assert_in_one_kernel.cpp b/SYCL/Assert/assert_in_one_kernel.cpp
index 62ca2af0ec..90c9c2d843 100644
--- a/SYCL/Assert/assert_in_one_kernel.cpp
+++ b/SYCL/Assert/assert_in_one_kernel.cpp
@@ -8,13 +8,13 @@
 // RUN: %GPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
 // Shouldn't fail on ACC as fallback assert isn't enqueued there
 // RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.txt
-// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --check-prefix=CHECK_ACC --input-file %t.txt
+// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --check-prefix=CHECK-ACC --input-file %t.txt
 //
 // CHECK:      {{.*}}assert_in_one_kernel.hpp:10: void kernelFunc(int *, int): global id: [{{[0-3]}},0,0], local id: [0,0,0]
 // CHECK-SAME: Assertion `Buf[wiID] != 0 && "from assert statement"` failed.
 // CHECK-NOT:  The test ended.
 //
-// CHECK_ACC-NOT: {{.*}}assert_in_one_kernel.hpp:10: void kernelFunc(int *, int): global id: [{{[0-3]}},0,0], local id: [0,0,0]
-// CHECK_ACC: The test ended.
+// CHECK-ACC-NOT: {{.*}}assert_in_one_kernel.hpp:10: void kernelFunc(int *, int): global id: [{{[0-3]}},0,0], local id: [0,0,0]
+// CHECK-ACC: The test ended.
 
 #include "assert_in_one_kernel.hpp"
diff --git a/SYCL/Assert/assert_in_one_kernel_win.cpp b/SYCL/Assert/assert_in_one_kernel_win.cpp
index d2e467bcdb..9516c11061 100644
--- a/SYCL/Assert/assert_in_one_kernel_win.cpp
+++ b/SYCL/Assert/assert_in_one_kernel_win.cpp
@@ -7,7 +7,7 @@
 // RUN: %GPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
 // Shouldn't fail on ACC as fallback assert isn't enqueued there
 // RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.txt
-// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --check-prefix=CHECK_ACC --input-file %t.txt
+// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --check-prefix=CHECK-ACC --input-file %t.txt
 //
 // FIXME Windows version prints '(null)' instead of '<unknown func>' once in a
 // while for some insane reason.
@@ -15,7 +15,7 @@
 // CHECK-SAME: Assertion `Buf[wiID] != 0 && "from assert statement"` failed.
 // CHECK-NOT:  The test ended.
 //
-// CHECK_ACC-NOT: {{.*}}assert_in_one_kernel.hpp:10: {{<unknown func>|(null)}}: global id: [{{[0-3]}},0,0], local id: [0,0,0]
-// CHECK_ACC:  The test ended.
+// CHECK-ACC-NOT: {{.*}}assert_in_one_kernel.hpp:10: {{<unknown func>|(null)}}: global id: [{{[0-3]}},0,0], local id: [0,0,0]
+// CHECK-ACC:  The test ended.
 
 #include "assert_in_one_kernel.hpp"
diff --git a/SYCL/Assert/assert_in_simultaneous_kernels.cpp b/SYCL/Assert/assert_in_simultaneous_kernels.cpp
index 2d72c27360..58cbf16e11 100644
--- a/SYCL/Assert/assert_in_simultaneous_kernels.cpp
+++ b/SYCL/Assert/assert_in_simultaneous_kernels.cpp
@@ -14,13 +14,13 @@
 // RUN: %GPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
 // Shouldn't fail on ACC as fallback assert isn't enqueued there
 // RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.txt
-// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --check-prefix=CHECK_ACC --input-file %t.txt
+// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --check-prefix=CHECK-ACC --input-file %t.txt
 //
 // CHECK:      {{.*}}assert_in_simultaneous_kernels.hpp:12: void assertFunc(): global id: [9,7,0], local id: [0,0,0]
 // CHECK-SAME: Assertion `false && "from assert statement"` failed.
 // CHECK-NOT:  The test ended.
 //
-// CHECK_ACC-NOT: {{.*}}assert_in_simultaneous_kernels.hpp:12: void assertFunc(): global id: [9,7,0], local id: [0,0,0]
-// CHECK_ACC: The test ended.
+// CHECK-ACC-NOT: {{.*}}assert_in_simultaneous_kernels.hpp:12: void assertFunc(): global id: [9,7,0], local id: [0,0,0]
+// CHECK-ACC: The test ended.
 
 #include "assert_in_simultaneous_kernels.hpp"
diff --git a/SYCL/Assert/assert_in_simultaneous_kernels_win.cpp b/SYCL/Assert/assert_in_simultaneous_kernels_win.cpp
index a3fcc1fb0c..5d40a54d48 100644
--- a/SYCL/Assert/assert_in_simultaneous_kernels_win.cpp
+++ b/SYCL/Assert/assert_in_simultaneous_kernels_win.cpp
@@ -13,7 +13,7 @@
 // RUN: %GPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
 // Shouldn't fail on ACC as fallback assert isn't enqueued there
 // RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.txt
-// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --check-prefix=CHECK_ACC --input-file %t.txt
+// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --check-prefix=CHECK-ACC --input-file %t.txt
 //
 // FIXME Windows version prints '(null)' instead of '<unknown func>' once in a
 // while for some insane reason.
@@ -21,7 +21,7 @@
 // CHECK-SAME: Assertion `false && "from assert statement"` failed.
 // CHECK-NOT:  The test ended.
 //
-// CHECK_ACC-NOT: {{.*}}assert_in_simultaneous_kernels.hpp:12: {{<unknown func>|(null)}}: global id: [9,7,0], local id: [0,0,0]
-// CHECK_ACC:  The test ended.
+// CHECK-ACC-NOT: {{.*}}assert_in_simultaneous_kernels.hpp:12: {{<unknown func>|(null)}}: global id: [9,7,0], local id: [0,0,0]
+// CHECK-ACC:  The test ended.
 
 #include "assert_in_simultaneous_kernels.hpp"
diff --git a/SYCL/Assert/assert_in_simultaneously_multiple_tus.cpp b/SYCL/Assert/assert_in_simultaneously_multiple_tus.cpp
index 579bf61044..8bd0d36c53 100644
--- a/SYCL/Assert/assert_in_simultaneously_multiple_tus.cpp
+++ b/SYCL/Assert/assert_in_simultaneously_multiple_tus.cpp
@@ -13,13 +13,13 @@
 // RUN: %GPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
 // Shouldn't fail on ACC as fallback assert isn't enqueued there
 // RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.txt
-// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --check-prefix=CHECK_ACC --input-file %t.txt
+// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --check-prefix=CHECK-ACC --input-file %t.txt
 //
 // CHECK:      {{this message from file1|this message from file2}}
 // CHECK-NOT:  The test ended.
 //
-// CHECK_ACC-NOT: {{this message from file1|this message from file2}}
-// CHECK_ACC: The test ended.
+// CHECK-ACC-NOT: {{this message from file1|this message from file2}}
+// CHECK-ACC: The test ended.
 
 #include "Inputs/kernels_in_file2.hpp"
 #include <CL/sycl.hpp>
diff --git a/SYCL/Assert/assert_in_simultaneously_multiple_tus_one_ndebug.cpp b/SYCL/Assert/assert_in_simultaneously_multiple_tus_one_ndebug.cpp
index e49f92a0d3..7e5a4f8180 100644
--- a/SYCL/Assert/assert_in_simultaneously_multiple_tus_one_ndebug.cpp
+++ b/SYCL/Assert/assert_in_simultaneously_multiple_tus_one_ndebug.cpp
@@ -13,10 +13,10 @@
 // RUN: %GPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
 // Shouldn't fail on ACC as fallback assert isn't enqueued there
 // RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.txt
-// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --check-prefix=CHECK_ACC --input-file %t.txt
+// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --check-prefix=CHECK-ACC --input-file %t.txt
 //
 // CHECK:      this message from file1
 // CHECK-NOT:  this message from file2
 // CHECK-NOT:  The test ended.
 //
-// CHECK_ACC: The test ended.
+// CHECK-ACC: The test ended.

From 831d8e972c229c0995bbb56a588cdc8c2b1334d9 Mon Sep 17 00:00:00 2001
From: Sergey Kanaev <sergey.kanaev@intel.com>
Date: Wed, 3 Nov 2021 16:47:30 +0300
Subject: [PATCH 6/7] Fix clang-format

Signed-off-by: Sergey Kanaev <sergey.kanaev@intel.com>
---
 SYCL/.clang-format | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SYCL/.clang-format b/SYCL/.clang-format
index bbe378509c..6203da37ad 100644
--- a/SYCL/.clang-format
+++ b/SYCL/.clang-format
@@ -1,2 +1,2 @@
 BasedOnStyle: LLVM
-CommentPragmas: "(RUN|FAIL|REQUIRES|UNSUPPORTED|CHECK|CHECK[-_][A-Za-z0-9]+) *:|expected-"
+CommentPragmas: "(RUN|FAIL|REQUIRES|UNSUPPORTED|CHECK|CHECK[A-Za-z0-9_-]+) *:|expected-"

From fe0ad571038bd5137f363425b422ed1560f567ae Mon Sep 17 00:00:00 2001
From: sergei <sergey.kanaev@intel.com>
Date: Thu, 9 Dec 2021 14:08:53 +0300
Subject: [PATCH 7/7] Simplify SYCL/.clang-format

Co-authored-by: Alexey Bader <alexey.bader@intel.com>
---
 SYCL/.clang-format | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SYCL/.clang-format b/SYCL/.clang-format
index 6203da37ad..b9df8e7314 100644
--- a/SYCL/.clang-format
+++ b/SYCL/.clang-format
@@ -1,2 +1,2 @@
 BasedOnStyle: LLVM
-CommentPragmas: "(RUN|FAIL|REQUIRES|UNSUPPORTED|CHECK|CHECK[A-Za-z0-9_-]+) *:|expected-"
+CommentPragmas: "(RUN|FAIL|REQUIRES|UNSUPPORTED|CHECK[A-Za-z0-9_-]*) *:|expected-"