adjust debug_option

Author: cperkinsintel

sycl/test-e2e/KernelAndProgram/kernel-bundle-merge-options.cpp

@@ -1,11 +1,8 @@
 // REQUIRES: gpu
-// RUN: %{build} -o %t.out -g
+// RUN: %{build} -o %t.out %debug_option
 // RUN: env SYCL_UR_TRACE=2 %{run} %t.out | FileCheck %s
 // UNSUPPORTED: hip
 
-// Rather than %debug_option, we just use -g since it's supported everywhere
-// and simplifies things on the FileCheck side.
-
 // Note that the UR call might be urProgramBuild OR urProgramBuildExp .
 // The same is true for Compile and Link.
 // We want the first match. Don't put parentheses after.

sycl/test-e2e/lit.cfg.py

@@ -381,7 +381,7 @@ def open_check_file(file_name):
         )
     )
     config.substitutions.append(("%include_option", "/FI"))
-    config.substitutions.append(("%debug_option", "/DEBUG"))
+    config.substitutions.append(("%debug_option", "/Zi /DEBUG"))
     config.substitutions.append(("%cxx_std_option", "/std:"))
     config.substitutions.append(("%fPIC", ""))
     config.substitutions.append(("%shared_lib", "/LD"))