From 33b50db5e9975928065a5de896207f13a5b552fd Mon Sep 17 00:00:00 2001 From: Chris Perkins Date: Wed, 18 Dec 2024 09:34:14 -0800 Subject: [PATCH] [SYCL] test improvement, issue 16309 (#16389) The kernel-bundle-merge-options test was recently marked XFAIL (and tracker #16309 opened). The root problem is that when using the MSVC CL compiler, the tests set the `debug_option` flag to `/DEBUG` but it is `/Zi` that gets converted to `-g` when the device driver is called. Updating that python var and removing the `XFAIL` from the test. --- .../kernel-bundle-merge-options.cpp | 16 ++++++++-------- sycl/test-e2e/lit.cfg.py | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sycl/test-e2e/KernelAndProgram/kernel-bundle-merge-options.cpp b/sycl/test-e2e/KernelAndProgram/kernel-bundle-merge-options.cpp index ba09fa1ea16ea..10037fe75f6b4 100644 --- a/sycl/test-e2e/KernelAndProgram/kernel-bundle-merge-options.cpp +++ b/sycl/test-e2e/KernelAndProgram/kernel-bundle-merge-options.cpp @@ -3,19 +3,19 @@ // RUN: env SYCL_UR_TRACE=2 %{run} %t.out | FileCheck %s // UNSUPPORTED: hip -// Debug option -g is not passed to device code compiler when CL-style driver -// is used and /DEBUG options is passed. -// XFAIL: cl_options -// XFAIL-TRACKER: https://github.com/intel/llvm/issues/16309 +// 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. #include "kernel-bundle-merge-options.hpp" // CHECK: <--- urProgramBuild // CHECK-SAME: -g -// TODO: Uncomment when build options are properly passed to compile and link +// CHECK: <--- urProgramCompile +// CHECK-SAME: -g + +// TODO: Uncomment when build options are properly passed to link // commands for kernel_bundle -// xCHECK: <--- urProgramCompile( -// xCHECK-SAME: -g -// xCHECK: <--- urProgramLink( +// xCHECK: <--- urProgramLink // xCHECK-SAME: -g diff --git a/sycl/test-e2e/lit.cfg.py b/sycl/test-e2e/lit.cfg.py index acd681718facd..90979fee17d90 100644 --- a/sycl/test-e2e/lit.cfg.py +++ b/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"))