From 5b76e9b6a1b425d32ebd06d7588acfa2c54df90a Mon Sep 17 00:00:00 2001
From: Vladimir Lazarev <vladimir.lazarev@intel.com>
Date: Wed, 1 Sep 2021 12:21:47 +0300
Subject: [PATCH] [SYCL] Allow extra command line options implicitely added by
 compiler

DPC++ compiler may add options to JIT compilation implicitely.
---
 SYCL/KernelAndProgram/kernel-bundle-merge-options-env.cpp | 2 +-
 SYCL/KernelAndProgram/kernel-bundle-merge-options.cpp     | 2 +-
 SYCL/KernelAndProgram/program-merge-options-env.cpp       | 2 +-
 SYCL/KernelAndProgram/program-merge-options.cpp           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/SYCL/KernelAndProgram/kernel-bundle-merge-options-env.cpp b/SYCL/KernelAndProgram/kernel-bundle-merge-options-env.cpp
index e3b6d8b6f4..daf25bfab0 100644
--- a/SYCL/KernelAndProgram/kernel-bundle-merge-options-env.cpp
+++ b/SYCL/KernelAndProgram/kernel-bundle-merge-options-env.cpp
@@ -9,7 +9,7 @@
 // CHECK-NEXT: <unknown>
 // CHECK-NEXT: <unknown>
 // CHECK-NEXT: <unknown>
-// CHECK-NEXT: <const char *>: -DENV_COMPILE_OPTS -vc-codegen
+// CHECK-NEXT: <const char *>:{{.*}}-DENV_COMPILE_OPTS{{.*}}-vc-codegen
 
 // TODO: Uncomment when build options are properly passed to compile and link
 //       commands for kernel_bundle
diff --git a/SYCL/KernelAndProgram/kernel-bundle-merge-options.cpp b/SYCL/KernelAndProgram/kernel-bundle-merge-options.cpp
index 84ce796af5..104b0c7fac 100644
--- a/SYCL/KernelAndProgram/kernel-bundle-merge-options.cpp
+++ b/SYCL/KernelAndProgram/kernel-bundle-merge-options.cpp
@@ -12,7 +12,7 @@
 // CHECK-NEXT: <unknown>
 // CHECK-NEXT: <unknown>
 // CHECK-NEXT: <unknown>
-// CHECK-NEXT: <const char *>: -g -vc-codegen
+// CHECK-NEXT: <const char *>:{{.*}} -g {{.*}}-vc-codegen
 
 // TODO: Uncomment when build options are properly passed to compile and link
 //       commands for kernel_bundle
diff --git a/SYCL/KernelAndProgram/program-merge-options-env.cpp b/SYCL/KernelAndProgram/program-merge-options-env.cpp
index 30bf22a52b..3cbacd0ac3 100644
--- a/SYCL/KernelAndProgram/program-merge-options-env.cpp
+++ b/SYCL/KernelAndProgram/program-merge-options-env.cpp
@@ -8,7 +8,7 @@
 // CHECK-NEXT: <unknown>
 // CHECK-NEXT: <unknown>
 // CHECK-NEXT: <unknown>
-// CHECK-NEXT: <const char *>: -DENV_COMPILE_OPTS -vc-codegen
+// CHECK-NEXT: <const char *>:{{.*}}-DENV_COMPILE_OPTS{{.*}}-vc-codegen
 
 // TODO: Uncomment when build options are properly passed to compile and link
 //       commands for program
diff --git a/SYCL/KernelAndProgram/program-merge-options.cpp b/SYCL/KernelAndProgram/program-merge-options.cpp
index 5c56e2f152..5fc8f1f431 100644
--- a/SYCL/KernelAndProgram/program-merge-options.cpp
+++ b/SYCL/KernelAndProgram/program-merge-options.cpp
@@ -12,7 +12,7 @@
 // CHECK-NEXT: <unknown>
 // CHECK-NEXT: <unknown>
 // CHECK-NEXT: <unknown>
-// CHECK-NEXT: <const char *>: -DBUILD_OPTS -g -vc-codegen
+// CHECK-NEXT: <const char *>:{{.*}}-DBUILD_OPTS{{.*}}-g{{.*}}-vc-codegen
 
 // TODO: Uncomment when build options are properly passed to compile and link
 //       commands for program