diff --git a/sycl/cmake/modules/FetchUnifiedRuntime.cmake b/sycl/cmake/modules/FetchUnifiedRuntime.cmake index fc511943f7908..6b6bfa4d8e65b 100644 --- a/sycl/cmake/modules/FetchUnifiedRuntime.cmake +++ b/sycl/cmake/modules/FetchUnifiedRuntime.cmake @@ -117,13 +117,13 @@ if(SYCL_UR_USE_FETCH_CONTENT) endfunction() set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git") - # commit f8336050f43a6529636fd6b2075dfe09961564f5 - # Merge: 6c98e0e8 b75f2bc2 + # commit d8f1c98e48e98ea2f6a227af82366734fcde977e + # Merge: 6e8efa3d 9e824480 # Author: Omar Ahmed - # Date: Tue Aug 13 13:07:23 2024 +0100 - # Merge pull request #1955 from nrspruit/fix_l0_coverity - # [L0] fix Coverity issues for L0 Adapter - set(UNIFIED_RUNTIME_TAG f8336050f43a6529636fd6b2075dfe09961564f5) + # Date: Wed Aug 14 11:46:59 2024 +0100 + # Merge pull request #1946 from callumfare/callum/update_ur_trace_env_var + # Update expected values of SYCL_UR_TRACE environment variable + set(UNIFIED_RUNTIME_TAG d8f1c98e48e98ea2f6a227af82366734fcde977e) set(UMF_BUILD_EXAMPLES OFF CACHE INTERNAL "EXAMPLES") # Due to the use of dependentloadflag and no installer for UMF and hwloc we need diff --git a/sycl/doc/EnvironmentVariables.md b/sycl/doc/EnvironmentVariables.md index 6ea07a4b7fd4c..8e10295ffa15b 100644 --- a/sycl/doc/EnvironmentVariables.md +++ b/sycl/doc/EnvironmentVariables.md @@ -196,7 +196,7 @@ variables in production code. | Environment variable | Values | Description | | -------------------- | ------ | ----------- | | `SYCL_PREFER_UR` | Integer | If non-0 then run through Unified Runtime if desired backend is supported there. Default is 0. | -| `SYCL_UR_TRACE` | Integer | If non-0 then enable Unified Runtime tracing. Default is 0. | +| `SYCL_UR_TRACE` | Integer | Described [below](#sycl_ur_trace-options) | Enable specified level of tracing for UR. | | `SYCL_QUEUE_THREAD_POOL_SIZE` | Positive integer | Number of threads in thread pool of queue. | | `SYCL_DEVICELIB_NO_FALLBACK` | Any(\*) | Disable loading and linking of device library images | | `SYCL_PRINT_EXECUTION_GRAPH` | Described [below](#sycl_print_execution_graph-options) | Print execution graph to DOT text file. | @@ -231,6 +231,21 @@ variables in production code. | after_addHostAcc | print graph after addHostAccessor method | | always | print graph before and after each of the above methods | + +### `SYCL_UR_TRACE` Options + +`SYCL_UR_TRACE` accepts a bit-mask, so individual tracing types can be enabled. +Setting a value of `-1` will enable all tracing types. + +Supported tracing levels are in the table below + +| Option | Description | +| ------ | ----------- | +| 1 | Enable basic tracing, which is tracing of UR adapters/devices discovery | +| 2 | Enable tracing of the UR calls | +| -1 | Enable all levels of tracing | + + ## Debugging variables for Level Zero Plugin :warning: **Warning:** the environment variables diff --git a/sycl/include/sycl/detail/ur.hpp b/sycl/include/sycl/detail/ur.hpp index 48e876e3adb6f..9f306ad479299 100644 --- a/sycl/include/sycl/detail/ur.hpp +++ b/sycl/include/sycl/detail/ur.hpp @@ -83,8 +83,12 @@ initializeUr(ur_loader_config_handle_t LoaderConfig = nullptr); // Get the plugin serving given backend. template const PluginPtr &getPlugin(); +// The SYCL_UR_TRACE sets what we will trace. +// This is a bit-mask of various things we'd want to trace. +enum TraceLevel { TRACE_BASIC = 0x1, TRACE_CALLS = 0x2, TRACE_ALL = -1 }; + // Return true if we want to trace UR related activities. -bool trace(); +bool trace(TraceLevel level); // Want all the needed casts be explicit, do not define conversion operators. template To cast(From value); diff --git a/sycl/source/detail/config.def b/sycl/source/detail/config.def index fe727bf17aad4..5ffd52a319bdb 100644 --- a/sycl/source/detail/config.def +++ b/sycl/source/detail/config.def @@ -14,8 +14,7 @@ CONFIG(SYCL_PRINT_EXECUTION_GRAPH, 32, __SYCL_PRINT_EXECUTION_GRAPH) CONFIG(SYCL_DISABLE_EXECUTION_GRAPH_CLEANUP, 1, __SYCL_DISABLE_EXECUTION_GRAPH_CLEANUP) CONFIG(SYCL_DISABLE_POST_ENQUEUE_CLEANUP, 1, __SYCL_DISABLE_POST_ENQUEUE_CLEANUP) CONFIG(SYCL_DEVICE_ALLOWLIST, 1024, __SYCL_DEVICE_ALLOWLIST) -CONFIG(SYCL_PI_TRACE, 16, __SYCL_PI_TRACE) -CONFIG(SYCL_UR_TRACE, 1, __SYCL_UR_TRACE) +CONFIG(SYCL_UR_TRACE, 16, __SYCL_UR_TRACE) CONFIG(SYCL_PARALLEL_FOR_RANGE_ROUNDING_TRACE, 16, __SYCL_PARALLEL_FOR_RANGE_ROUNDING_TRACE) CONFIG(SYCL_DISABLE_PARALLEL_FOR_RANGE_ROUNDING, 16, __SYCL_DISABLE_PARALLEL_FOR_RANGE_ROUNDING) CONFIG(SYCL_PARALLEL_FOR_RANGE_ROUNDING_PARAMS, 64, __SYCL_PARALLEL_FOR_RANGE_ROUNDING_PARAMS) diff --git a/sycl/source/detail/config.hpp b/sycl/source/detail/config.hpp index f6d37c4af60db..599f21f02e1ce 100644 --- a/sycl/source/detail/config.hpp +++ b/sycl/source/detail/config.hpp @@ -127,6 +127,28 @@ template class SYCLConfig { } }; +template <> class SYCLConfig { + using BaseT = SYCLConfigBase; + +public: + static int get() { + static bool Initialized = false; + // We don't use TraceLevel enum here because user can provide any bitmask + // which can correspond to several enum values. + static int Level = 0; // No tracing by default + + // Configuration parameters are processed only once, like reading a string + // from environment and converting it into a typed object. + if (Initialized) + return Level; + + const char *ValStr = BaseT::getRawValue(); + Level = (ValStr ? std::atoi(ValStr) : 0); + Initialized = true; + return Level; + } +}; + template <> class SYCLConfig { using BaseT = SYCLConfigBase; diff --git a/sycl/source/detail/global_handler.cpp b/sycl/source/detail/global_handler.cpp index 121f47dd43266..bdd095ef28c1d 100644 --- a/sycl/source/detail/global_handler.cpp +++ b/sycl/source/detail/global_handler.cpp @@ -362,7 +362,9 @@ extern "C" __SYCL_EXPORT BOOL WINAPI DllMain(HINSTANCE hinstDLL, std::exit(1); } - bool PrintUrTrace = sycl::detail::ur::trace(); + bool PrintUrTrace = + sycl::detail::ur::trace(sycl::detail::ur::TraceLevel::TRACE_CALLS); + // Perform actions based on the reason for calling. switch (fdwReason) { case DLL_PROCESS_DETACH: diff --git a/sycl/source/detail/platform_impl.cpp b/sycl/source/detail/platform_impl.cpp index fc50886ada43c..b3214ed27b698 100644 --- a/sycl/source/detail/platform_impl.cpp +++ b/sycl/source/detail/platform_impl.cpp @@ -86,7 +86,7 @@ static bool IsBannedPlatform(platform Platform) { name) != std::string::npos; const auto Backend = detail::getSyclObjImpl(Platform)->getBackend(); const bool IsMatchingOCL = (HasNameMatch && Backend == backend::opencl); - if (detail::ur::trace() && IsMatchingOCL) { + if (detail::ur::trace(detail::ur::TraceLevel::TRACE_ALL) && IsMatchingOCL) { std::cout << "SYCL_UR_TRACE: " << name << " OpenCL platform found but is not compatible." << std::endl; } diff --git a/sycl/source/detail/posix_ur.cpp b/sycl/source/detail/posix_ur.cpp index 8ca9991a03363..80618428c4ef7 100644 --- a/sycl/source/detail/posix_ur.cpp +++ b/sycl/source/detail/posix_ur.cpp @@ -21,7 +21,7 @@ void *loadOsLibrary(const std::string &LibraryPath) { // TODO: Check if the option RTLD_NOW is correct. Explore using // RTLD_DEEPBIND option when there are multiple plugins. void *so = dlopen(LibraryPath.c_str(), RTLD_NOW); - if (!so && detail::ur::trace()) { + if (!so && trace(TraceLevel::TRACE_ALL)) { char *Error = dlerror(); std::cerr << "SYCL_UR_TRACE: dlopen(" << LibraryPath << ") failed with <" << (Error ? Error : "unknown error") << ">" << std::endl; diff --git a/sycl/source/detail/ur.cpp b/sycl/source/detail/ur.cpp index 3671d6945abb0..d7ffb6cb3ac9a 100644 --- a/sycl/source/detail/ur.cpp +++ b/sycl/source/detail/ur.cpp @@ -75,7 +75,10 @@ void *getPluginOpaqueData([[maybe_unused]] void *OpaqueDataParam) { } namespace ur { -bool trace() { return SYCLConfig::get(); } +bool trace(TraceLevel Level) { + auto TraceLevelMask = SYCLConfig::get(); + return (TraceLevelMask & Level) == Level; +} static void initializePlugins(std::vector &Plugins, ur_loader_config_handle_t LoaderConfig); @@ -108,20 +111,23 @@ static void initializePlugins(std::vector &Plugins, OwnLoaderConfig = true; } - auto SyclURTrace = SYCLConfig::get(); - if (SyclURTrace && (std::atoi(SyclURTrace) != 0)) { - const char *LogOptions = "level:info;output:stdout;flush:info"; + const char *LogOptions = "level:info;output:stdout;flush:info"; + if (trace(TraceLevel::TRACE_CALLS)) { #ifdef _WIN32 _putenv_s("UR_LOG_TRACING", LogOptions); - _putenv_s("UR_LOG_LOADER", LogOptions); #else setenv("UR_LOG_TRACING", LogOptions, 1); - setenv("UR_LOG_LOADER", LogOptions, 1); #endif + CHECK_UR_SUCCESS( + urLoaderConfigEnableLayer(LoaderConfig, "UR_LAYER_TRACING")); } - if (std::getenv("UR_LOG_TRACING")) { - CHECK_UR_SUCCESS(urLoaderConfigEnableLayer(LoaderConfig, "UR_LAYER_TRACING")); + if (trace(TraceLevel::TRACE_BASIC)) { +#ifdef _WIN32 + _putenv_s("UR_LOG_LOADER", LogOptions); +#else + setenv("UR_LOG_LOADER", LogOptions, 1); +#endif } CHECK_UR_SUCCESS(urLoaderConfigSetCodeLocationCallback( diff --git a/sycl/source/device_selector.cpp b/sycl/source/device_selector.cpp index b0e5bfb18fcf0..124f120394580 100644 --- a/sycl/source/device_selector.cpp +++ b/sycl/source/device_selector.cpp @@ -48,7 +48,13 @@ static int getDevicePreference(const device &Device) { } static void traceDeviceSelection(const device &Device, int Score, bool Chosen) { - bool shouldTrace = detail::ur::trace(); + bool shouldTrace = false; + if (Chosen) { + shouldTrace = detail::ur::trace(detail::ur::TraceLevel::TRACE_BASIC); + } else { + shouldTrace = detail::ur::trace(detail::ur::TraceLevel::TRACE_ALL); + } + if (shouldTrace) { std::string PlatformName = Device.get_info() .get_info(); @@ -162,7 +168,7 @@ select_device(const DSelectorInvocableType &DeviceSelectorInvocable, /// 4. Accelerator static void traceDeviceSelector(const std::string &DeviceType) { - bool ShouldTrace = detail::ur::trace(); + bool ShouldTrace = detail::ur::trace(detail::ur::TraceLevel::TRACE_BASIC); if (ShouldTrace) { std::cout << "SYCL_UR_TRACE: Requested device_type: " << DeviceType << std::endl; diff --git a/sycl/source/handler.cpp b/sycl/source/handler.cpp index 4d89d4826a722..33431ebd4b47b 100644 --- a/sycl/source/handler.cpp +++ b/sycl/source/handler.cpp @@ -493,7 +493,7 @@ event handler::finalize() { MCodeLoc)); break; case detail::CGType::None: - if (detail::ur::trace()) { + if (detail::ur::trace(detail::ur::TraceLevel::TRACE_ALL)) { std::cout << "WARNING: An empty command group is submitted." << std::endl; } diff --git a/sycl/test-e2e/Basic/alloc_pinned_host_memory.cpp b/sycl/test-e2e/Basic/alloc_pinned_host_memory.cpp index b758527a301d8..0ee4db8f332b1 100644 --- a/sycl/test-e2e/Basic/alloc_pinned_host_memory.cpp +++ b/sycl/test-e2e/Basic/alloc_pinned_host_memory.cpp @@ -1,7 +1,7 @@ // REQUIRES: level_zero || cuda // RUN: %{build} -o %t2.out -// RUN: env SYCL_UR_TRACE=1 UR_L0_DEBUG=1 %{run} %t2.out %if level_zero %{ 2>&1 | FileCheck %s %} +// RUN: env SYCL_UR_TRACE=2 UR_L0_DEBUG=1 %{run} %t2.out %if level_zero %{ 2>&1 | FileCheck %s %} // RUN: %{run} %t2.out #include diff --git a/sycl/test-e2e/Basic/buffer/native_buffer_creation_flags.cpp b/sycl/test-e2e/Basic/buffer/native_buffer_creation_flags.cpp index 311740f37a75a..c7fae978d3fa7 100644 --- a/sycl/test-e2e/Basic/buffer/native_buffer_creation_flags.cpp +++ b/sycl/test-e2e/Basic/buffer/native_buffer_creation_flags.cpp @@ -1,6 +1,6 @@ // REQUIRES: cpu // RUN: %{build} -o %t.out -// RUN: env SYCL_UR_TRACE=1 %{run} %t.out 2>&1 | FileCheck %s +// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s #include diff --git a/sycl/test-e2e/Basic/buffer/subbuffer_overlap.cpp b/sycl/test-e2e/Basic/buffer/subbuffer_overlap.cpp index 89cbed42c25f7..91cf5360549e7 100644 --- a/sycl/test-e2e/Basic/buffer/subbuffer_overlap.cpp +++ b/sycl/test-e2e/Basic/buffer/subbuffer_overlap.cpp @@ -1,6 +1,6 @@ // RUN: %{build} -o %t.out // RUN: %{run} %t.out -// RUN: env SYCL_UR_TRACE=1 %{run} %t.out 2>&1 | FileCheck %s +// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s #include diff --git a/sycl/test-e2e/Basic/enqueue_barrier.cpp b/sycl/test-e2e/Basic/enqueue_barrier.cpp index 883873d200533..1e5890ae985cf 100644 --- a/sycl/test-e2e/Basic/enqueue_barrier.cpp +++ b/sycl/test-e2e/Basic/enqueue_barrier.cpp @@ -1,5 +1,5 @@ // RUN: %{build} -o %t.out -// RUN: env SYCL_UR_TRACE=1 %{run} %t.out 2>&1 | FileCheck %s +// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s // The test is failing sporadically on Windows OpenCL RTs // Disabling on windows until fixed diff --git a/sycl/test-e2e/Basic/event_release.cpp b/sycl/test-e2e/Basic/event_release.cpp index 8df5b7f041ba3..0ecccfa4dcecc 100644 --- a/sycl/test-e2e/Basic/event_release.cpp +++ b/sycl/test-e2e/Basic/event_release.cpp @@ -1,6 +1,6 @@ // REQUIRES: cpu // RUN: %{build} -o %t.out -// RUN: env SYCL_UR_TRACE=1 %{run} %t.out 2>&1 | FileCheck %s +// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s #include #include #include diff --git a/sycl/test-e2e/Basic/fill_accessor_ur.cpp b/sycl/test-e2e/Basic/fill_accessor_ur.cpp index 8faeee9854b7a..c93f327be1199 100644 --- a/sycl/test-e2e/Basic/fill_accessor_ur.cpp +++ b/sycl/test-e2e/Basic/fill_accessor_ur.cpp @@ -1,5 +1,5 @@ // RUN: %{build} -o %t.out -// RUN: env SYCL_UR_TRACE=1 %{run} %t.out | FileCheck %s +// RUN: env SYCL_UR_TRACE=2 %{run} %t.out | FileCheck %s // This test merely checks the use of the correct UR call. Its sister test // fill_accessor.cpp thoroughly checks the workings of the .fill() call. diff --git a/sycl/test-e2e/Basic/host-task-dependency.cpp b/sycl/test-e2e/Basic/host-task-dependency.cpp index ae8456d6be88d..791c334341342 100644 --- a/sycl/test-e2e/Basic/host-task-dependency.cpp +++ b/sycl/test-e2e/Basic/host-task-dependency.cpp @@ -1,5 +1,5 @@ // RUN: %{build} -o %t.out %threads_lib -// RUN: env SYCL_UR_TRACE=1 %{run} %t.out 2>&1 | FileCheck %s +// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s // // TODO: Behaviour is unstable for level zero on Windows. Enable when fixed. // TODO: The test is sporadically fails on CUDA. Enable when fixed. diff --git a/sycl/test-e2e/Basic/kernel_bundle/kernel_bundle_api.cpp b/sycl/test-e2e/Basic/kernel_bundle/kernel_bundle_api.cpp index 6911bccffbcca..32d2706eb15b0 100644 --- a/sycl/test-e2e/Basic/kernel_bundle/kernel_bundle_api.cpp +++ b/sycl/test-e2e/Basic/kernel_bundle/kernel_bundle_api.cpp @@ -5,7 +5,7 @@ // device image is statically linked against fallback libdevice. // RUN: %{build} %if cpu %{ -DSYCL_DISABLE_FALLBACK_ASSERT=1 %} -fsycl-device-code-split=per_kernel -o %t.out // RUN: %if cuda %{ %{run} %t.out %} -// RUN: %if cpu %{ env SYCL_UR_TRACE=1 %{run} %t.out | FileCheck %s %} +// RUN: %if cpu %{ env SYCL_UR_TRACE=2 %{run} %t.out | FileCheck %s %} #include #include diff --git a/sycl/test-e2e/Basic/queue/release.cpp b/sycl/test-e2e/Basic/queue/release.cpp index 22840a8e8778a..fe788c59c4bf7 100644 --- a/sycl/test-e2e/Basic/queue/release.cpp +++ b/sycl/test-e2e/Basic/queue/release.cpp @@ -1,5 +1,5 @@ // RUN: %{build} -o %t.out -// RUN: env SYCL_UR_TRACE=1 %{run} %t.out | FileCheck %s +// RUN: env SYCL_UR_TRACE=2 %{run} %t.out | FileCheck %s // // TODO: Reenable on Windows, see https://github.com/intel/llvm/issues/14768 // XFAIL: hip_nvidia, windows diff --git a/sycl/test-e2e/Basic/stream/release_resources_test.cpp b/sycl/test-e2e/Basic/stream/release_resources_test.cpp index 9b8e47c8eb735..2a16c44d9a7ed 100644 --- a/sycl/test-e2e/Basic/stream/release_resources_test.cpp +++ b/sycl/test-e2e/Basic/stream/release_resources_test.cpp @@ -2,7 +2,7 @@ // to fail there. See comments in GlobalHandler::releaseDefaultContexts // UNSUPPORTED: windows // RUN: %{build} -o %t.out -// RUN: env SYCL_UR_TRACE=1 %{run} %t.out | FileCheck %s +// RUN: env SYCL_UR_TRACE=2 %{run} %t.out | FileCheck %s // Check that buffer used by a stream object is released. diff --git a/sycl/test-e2e/Basic/subdevice_pi.cpp b/sycl/test-e2e/Basic/subdevice_pi.cpp index bdb93d9411536..a4c22ea1a2ea3 100644 --- a/sycl/test-e2e/Basic/subdevice_pi.cpp +++ b/sycl/test-e2e/Basic/subdevice_pi.cpp @@ -3,9 +3,9 @@ // REQUIRES: cpu // // RUN: %{build} -o %t.out -// RUN: env SYCL_UR_TRACE=1 %{run} %t.out separate equally | FileCheck %s --check-prefix CHECK-SEPARATE -// RUN: env SYCL_UR_TRACE=1 %{run} %t.out shared equally | FileCheck %s --check-prefix CHECK-SHARED --implicit-check-not piContextCreate --implicit-check-not piMemBufferCreate -// RUN: env SYCL_UR_TRACE=1 %{run} %t.out fused equally | FileCheck %s --check-prefix CHECK-FUSED --implicit-check-not piContextCreate --implicit-check-not piMemBufferCreate +// RUN: env SYCL_UR_TRACE=2 %{run} %t.out separate equally | FileCheck %s --check-prefix CHECK-SEPARATE +// RUN: env SYCL_UR_TRACE=2 %{run} %t.out shared equally | FileCheck %s --check-prefix CHECK-SHARED --implicit-check-not piContextCreate --implicit-check-not piMemBufferCreate +// RUN: env SYCL_UR_TRACE=2 %{run} %t.out fused equally | FileCheck %s --check-prefix CHECK-FUSED --implicit-check-not piContextCreate --implicit-check-not piMemBufferCreate #include #include diff --git a/sycl/test-e2e/Basic/use_pinned_host_memory.cpp b/sycl/test-e2e/Basic/use_pinned_host_memory.cpp index d73971810ec25..bc740afb95a95 100644 --- a/sycl/test-e2e/Basic/use_pinned_host_memory.cpp +++ b/sycl/test-e2e/Basic/use_pinned_host_memory.cpp @@ -1,6 +1,6 @@ // REQUIRES: cpu // RUN: %{build} -o %t.out -// RUN: env SYCL_UR_TRACE=1 %{run} %t.out 2>&1 | FileCheck %s +// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s #include diff --git a/sycl/test-e2e/DeviceCodeSplit/grf.cpp b/sycl/test-e2e/DeviceCodeSplit/grf.cpp index e30110c15d92e..cf494a96633d6 100644 --- a/sycl/test-e2e/DeviceCodeSplit/grf.cpp +++ b/sycl/test-e2e/DeviceCodeSplit/grf.cpp @@ -15,17 +15,17 @@ // REQUIRES: arch-intel_gpu_pvc // RUN: %{build} -o %t.out -// RUN: env SYCL_UR_TRACE=1 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-NO-VAR -// RUN: env SYCL_PROGRAM_COMPILE_OPTIONS="-g" SYCL_UR_TRACE=1 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-WITH-VAR +// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-NO-VAR +// RUN: env SYCL_PROGRAM_COMPILE_OPTIONS="-g" SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-WITH-VAR // RUN: %{build} -DUSE_NEW_API=1 -o %t.out -// RUN: env SYCL_UR_TRACE=1 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-NO-VAR -// RUN: env SYCL_PROGRAM_COMPILE_OPTIONS="-g" SYCL_UR_TRACE=1 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-WITH-VAR +// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-NO-VAR +// RUN: env SYCL_PROGRAM_COMPILE_OPTIONS="-g" SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-WITH-VAR // RUN: %{build} -DUSE_AUTO_GRF=1 -o %t.out -// RUN: env SYCL_UR_TRACE=1 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-AUTO-NO-VAR -// RUN: env SYCL_PROGRAM_COMPILE_OPTIONS="-g" SYCL_UR_TRACE=1 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-AUTO-WITH-VAR +// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-AUTO-NO-VAR +// RUN: env SYCL_PROGRAM_COMPILE_OPTIONS="-g" SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-AUTO-WITH-VAR // RUN: %{build} -DUSE_NEW_API=1 -DUSE_AUTO_GRF=1 -o %t.out -// RUN: env SYCL_UR_TRACE=1 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-AUTO-NO-VAR -// RUN: env SYCL_PROGRAM_COMPILE_OPTIONS="-g" SYCL_UR_TRACE=1 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-AUTO-WITH-VAR +// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-AUTO-NO-VAR +// RUN: env SYCL_PROGRAM_COMPILE_OPTIONS="-g" SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-AUTO-WITH-VAR #include "../helpers.hpp" #include #include diff --git a/sycl/test-e2e/DeviceLib/assert-windows.cpp b/sycl/test-e2e/DeviceLib/assert-windows.cpp index 777c486af65e5..1aa11bebec67e 100644 --- a/sycl/test-e2e/DeviceLib/assert-windows.cpp +++ b/sycl/test-e2e/DeviceLib/assert-windows.cpp @@ -13,7 +13,7 @@ // explicitly. Since the test is going to crash, we'll have to follow a similar // approach as on Linux - call the test in a subprocess. // -// RUN: env SYCL_UR_TRACE=1 SYCL_DEVICELIB_INHIBIT_NATIVE=1 CL_CONFIG_USE_VECTORIZER=False %{run} %t.out | FileCheck %s --check-prefix=CHECK-FALLBACK +// RUN: env SYCL_UR_TRACE=2 SYCL_DEVICELIB_INHIBIT_NATIVE=1 CL_CONFIG_USE_VECTORIZER=False %{run} %t.out | FileCheck %s --check-prefix=CHECK-FALLBACK // RUN: env SHOULD_CRASH=1 SYCL_DEVICELIB_INHIBIT_NATIVE=1 CL_CONFIG_USE_VECTORIZER=False %{run} %t.out | FileCheck %s --check-prefix=CHECK-MESSAGE // // CHECK-MESSAGE: {{.*}}assert-windows.cpp:{{[0-9]+}}: (null): global id: diff --git a/sycl/test-e2e/DeviceLib/assert.cpp b/sycl/test-e2e/DeviceLib/assert.cpp index 81bedb8d0350e..af70c6b950835 100644 --- a/sycl/test-e2e/DeviceLib/assert.cpp +++ b/sycl/test-e2e/DeviceLib/assert.cpp @@ -69,7 +69,7 @@ // extension is a new feature and may not be supported by the runtime used with // SYCL. // -// RUN: %if cpu %{ env SYCL_UR_TRACE=1 SHOULD_CRASH=1 EXPECTED_SIGNAL=SIGABRT %{run} %t.out 2> %t.stderr.native %} +// RUN: %if cpu %{ env SYCL_UR_TRACE=2 SHOULD_CRASH=1 EXPECTED_SIGNAL=SIGABRT %{run} %t.out 2> %t.stderr.native %} // RUN: %if cpu %{ FileCheck %s --input-file %t.stderr.native --check-prefixes=CHECK-MESSAGE || FileCheck %s --input-file %t.stderr.native --check-prefix CHECK-NOTSUPPORTED %} // RUN: %if gpu %{ env SHOULD_CRASH=1 EXPECTED_SIGNAL=SIGIOT %{run} %t.out 2> %t.stderr.native %} // RUN: %if gpu %{ FileCheck %s --input-file %t.stderr.native --check-prefixes=CHECK-MESSAGE || FileCheck %s --input-file %t.stderr.native --check-prefix CHECK-NOTSUPPORTED %} diff --git a/sycl/test-e2e/DiscardEvents/discard_events_accessors.cpp b/sycl/test-e2e/DiscardEvents/discard_events_accessors.cpp index 7656ce8e146c7..bbf235800c0b3 100644 --- a/sycl/test-e2e/DiscardEvents/discard_events_accessors.cpp +++ b/sycl/test-e2e/DiscardEvents/discard_events_accessors.cpp @@ -1,6 +1,6 @@ // RUN: %{build} -Wno-error=deprecated-declarations -o %t.out // -// RUN: env SYCL_UR_TRACE=1 %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt +// RUN: env SYCL_UR_TRACE=2 %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt // // The test checks that the last parameter is `nullptr` for // urEnqueueKernelLaunch for USM kernel using local accessor, but diff --git a/sycl/test-e2e/DiscardEvents/discard_events_using_assert.cpp b/sycl/test-e2e/DiscardEvents/discard_events_using_assert.cpp index df123883fdc5d..9424cfdc8fb3b 100644 --- a/sycl/test-e2e/DiscardEvents/discard_events_using_assert.cpp +++ b/sycl/test-e2e/DiscardEvents/discard_events_using_assert.cpp @@ -4,7 +4,7 @@ // UNSUPPORTED: ze_debug // RUN: %{build} -o %t.out // -// RUN: env SYCL_UR_TRACE=1 %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt +// RUN: env SYCL_UR_TRACE=2 %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt // // The test checks that the last parameter is not `nullptr` for // urEnqueueKernelLaunch. diff --git a/sycl/test-e2e/DiscardEvents/discard_events_using_assert_ndebug.cpp b/sycl/test-e2e/DiscardEvents/discard_events_using_assert_ndebug.cpp index 5a91ff7c87f9e..925d1d07cce93 100644 --- a/sycl/test-e2e/DiscardEvents/discard_events_using_assert_ndebug.cpp +++ b/sycl/test-e2e/DiscardEvents/discard_events_using_assert_ndebug.cpp @@ -1,6 +1,6 @@ // RUN: %{build} -DNDEBUG -o %t.out // -// RUN: env SYCL_UR_TRACE=1 %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt +// RUN: env SYCL_UR_TRACE=2 %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt // // The test checks that the last parameter is `nullptr` for // urEnqueueKernelLaunch. diff --git a/sycl/test-e2e/ESIMD/esimd_check_vc_codegen.cpp b/sycl/test-e2e/ESIMD/esimd_check_vc_codegen.cpp index 3267e787c2d79..09281973850c2 100644 --- a/sycl/test-e2e/ESIMD/esimd_check_vc_codegen.cpp +++ b/sycl/test-e2e/ESIMD/esimd_check_vc_codegen.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // RUN: %{build} -o %t.out -// RUN: env SYCL_UR_TRACE=1 %{run} %t.out 2>&1 | FileCheck %s +// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s #include "esimd_test_utils.hpp" diff --git a/sycl/test-e2e/ESIMD/grf.cpp b/sycl/test-e2e/ESIMD/grf.cpp index d305c1d3a0007..664cc833fb37f 100644 --- a/sycl/test-e2e/ESIMD/grf.cpp +++ b/sycl/test-e2e/ESIMD/grf.cpp @@ -16,14 +16,14 @@ // REQUIRES: arch-intel_gpu_pvc // invokes 'urProgramBuild'/'urKernelCreate' // RUN: %{build} -o %t.out -// RUN: env SYCL_UR_TRACE=1 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-NO-VAR -// RUN: env SYCL_PROGRAM_COMPILE_OPTIONS="-g" SYCL_UR_TRACE=1 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-WITH-VAR +// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-NO-VAR +// RUN: env SYCL_PROGRAM_COMPILE_OPTIONS="-g" SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-WITH-VAR // RUN: %{build} -DUSE_NEW_API=1 -o %t.out -// RUN: env SYCL_UR_TRACE=1 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-NO-VAR -// RUN: env SYCL_PROGRAM_COMPILE_OPTIONS="-g" SYCL_UR_TRACE=1 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-WITH-VAR +// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-NO-VAR +// RUN: env SYCL_PROGRAM_COMPILE_OPTIONS="-g" SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-WITH-VAR // RUN: %{build} -DUSE_AUTO -o %t.out -// RUN: env SYCL_UR_TRACE=1 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-AUTO-NO-VAR -// RUN: env SYCL_PROGRAM_COMPILE_OPTIONS="-g" SYCL_UR_TRACE=1 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-AUTO-WITH-VAR +// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-AUTO-NO-VAR +// RUN: env SYCL_PROGRAM_COMPILE_OPTIONS="-g" SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-AUTO-WITH-VAR #include "esimd_test_utils.hpp" #if defined(USE_NEW_API) || defined(USE_AUTO) diff --git a/sycl/test-e2e/ESIMD/spec_const/spec_const_redefine.cpp b/sycl/test-e2e/ESIMD/spec_const/spec_const_redefine.cpp index 7aef5acf4031a..4fd6262d48098 100644 --- a/sycl/test-e2e/ESIMD/spec_const/spec_const_redefine.cpp +++ b/sycl/test-e2e/ESIMD/spec_const/spec_const_redefine.cpp @@ -1,5 +1,5 @@ // RUN: %{build} -o %t.out -// RUN: env SYCL_UR_TRACE=1 %{run} %t.out 2>&1 | FileCheck %s +// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s //==----------- spec_const_redefine.cpp ------------------------------==// // diff --git a/sycl/test-e2e/ESIMD/sycl_esimd_mix.cpp b/sycl/test-e2e/ESIMD/sycl_esimd_mix.cpp index 8c447b82b3e2e..b8d3df7291b94 100644 --- a/sycl/test-e2e/ESIMD/sycl_esimd_mix.cpp +++ b/sycl/test-e2e/ESIMD/sycl_esimd_mix.cpp @@ -9,8 +9,8 @@ // in the same program . // RUN: %{build} -o %t.out -// RUN: env SYCL_UR_TRACE=1 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-NO-VAR -// RUN: env SYCL_PROGRAM_COMPILE_OPTIONS="-g" SYCL_UR_TRACE=1 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-WITH-VAR +// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-NO-VAR +// RUN: env SYCL_PROGRAM_COMPILE_OPTIONS="-g" SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-WITH-VAR #include "esimd_test_utils.hpp" diff --git a/sycl/test-e2e/EnqueueFunctions/barrier.cpp b/sycl/test-e2e/EnqueueFunctions/barrier.cpp index 887fca484ed52..fea819d62ad08 100644 --- a/sycl/test-e2e/EnqueueFunctions/barrier.cpp +++ b/sycl/test-e2e/EnqueueFunctions/barrier.cpp @@ -1,5 +1,5 @@ // RUN: %{build} -o %t.out -// RUN: env SYCL_UR_TRACE=1 %{run} %t.out 2>&1 | FileCheck %s +// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s // Tests the enqueue free function barriers. diff --git a/sycl/test-e2e/EnqueueFunctions/mem_advise.cpp b/sycl/test-e2e/EnqueueFunctions/mem_advise.cpp index 218f15570c2ee..b3ffc709a9332 100644 --- a/sycl/test-e2e/EnqueueFunctions/mem_advise.cpp +++ b/sycl/test-e2e/EnqueueFunctions/mem_advise.cpp @@ -1,6 +1,6 @@ // REQUIRES: aspect-usm_shared_allocations // RUN: %{build} -o %t.out -// RUN: env SYCL_UR_TRACE=1 %{run} %t.out 2>&1 | FileCheck %s +// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s // Tests the enqueue free function mem_advise. diff --git a/sycl/test-e2e/EnqueueFunctions/prefetch.cpp b/sycl/test-e2e/EnqueueFunctions/prefetch.cpp index 941d6ee993446..af2a312a576ec 100644 --- a/sycl/test-e2e/EnqueueFunctions/prefetch.cpp +++ b/sycl/test-e2e/EnqueueFunctions/prefetch.cpp @@ -1,6 +1,6 @@ // REQUIRES: aspect-usm_shared_allocations // RUN: %{build} -o %t.out -// RUN: env SYCL_UR_TRACE=1 %{run} %t.out 2>&1 | FileCheck %s +// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s // Tests the enqueue free function prefetch. diff --git a/sycl/test-e2e/Graph/Explicit/kernel_bundle.cpp b/sycl/test-e2e/Graph/Explicit/kernel_bundle.cpp index d283845085918..a43f7bb47d37f 100644 --- a/sycl/test-e2e/Graph/Explicit/kernel_bundle.cpp +++ b/sycl/test-e2e/Graph/Explicit/kernel_bundle.cpp @@ -1,6 +1,6 @@ // RUN: %{build} -o %t.out // RUN: %if cuda %{ %{run} %t.out %} -// RUN: %if level_zero %{env SYCL_UR_TRACE=1 %{run} %t.out | FileCheck %s --implicit-check-not=LEAK %} +// RUN: %if level_zero %{env SYCL_UR_TRACE=2 %{run} %t.out | FileCheck %s --implicit-check-not=LEAK %} // Checks the UR call trace to ensure that the bundle kernel of the single task // is used. diff --git a/sycl/test-e2e/Graph/Explicit/memadvise.cpp b/sycl/test-e2e/Graph/Explicit/memadvise.cpp index 9bd335cef3a49..080951e2663c5 100644 --- a/sycl/test-e2e/Graph/Explicit/memadvise.cpp +++ b/sycl/test-e2e/Graph/Explicit/memadvise.cpp @@ -1,5 +1,5 @@ // RUN: %{build} -o %t.out -// RUN: %if linux && (level_zero || cuda) %{ env SYCL_UR_TRACE=1 %{run} %t.out 2>&1 FileCheck %s %} %else %{ %{run} %t.out %} +// RUN: %if linux && (level_zero || cuda) %{ env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 FileCheck %s %} %else %{ %{run} %t.out %} // REQUIRES: aspect-usm_shared_allocations diff --git a/sycl/test-e2e/Graph/Explicit/prefetch.cpp b/sycl/test-e2e/Graph/Explicit/prefetch.cpp index a39e148ccaaed..a51d98b837075 100644 --- a/sycl/test-e2e/Graph/Explicit/prefetch.cpp +++ b/sycl/test-e2e/Graph/Explicit/prefetch.cpp @@ -1,5 +1,5 @@ // RUN: %{build} -o %t.out -// RUN: %if linux && (level_zero || cuda) %{ env SYCL_UR_TRACE=1 %{run} %t.out 2>&1 FileCheck %s %} %else %{ %{run} %t.out %} +// RUN: %if linux && (level_zero || cuda) %{ env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 FileCheck %s %} %else %{ %{run} %t.out %} // REQUIRES: aspect-usm_shared_allocations diff --git a/sycl/test-e2e/Graph/RecordReplay/kernel_bundle.cpp b/sycl/test-e2e/Graph/RecordReplay/kernel_bundle.cpp index 84004ff40d381..d347cc58b0754 100644 --- a/sycl/test-e2e/Graph/RecordReplay/kernel_bundle.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/kernel_bundle.cpp @@ -1,6 +1,6 @@ // RUN: %{build} -o %t.out // RUN: %if cuda %{ %{run} %t.out %} -// RUN: %if level_zero %{env SYCL_UR_TRACE=1 %{run} %t.out | FileCheck %s --implicit-check-not=LEAK %} +// RUN: %if level_zero %{env SYCL_UR_TRACE=2 %{run} %t.out | FileCheck %s --implicit-check-not=LEAK %} // Checks the UR call trace to ensure that the bundle kernel of the single task // is used. diff --git a/sycl/test-e2e/Graph/RecordReplay/memadvise.cpp b/sycl/test-e2e/Graph/RecordReplay/memadvise.cpp index 7a4c0791a7811..b1ba7b2eea9c6 100644 --- a/sycl/test-e2e/Graph/RecordReplay/memadvise.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/memadvise.cpp @@ -1,5 +1,5 @@ // RUN: %{build} -o %t.out -// RUN: %if linux && (level_zero || cuda) %{ env SYCL_UR_TRACE=1 %{run} %t.out 2>&1 FileCheck %s %} %else %{ %{run} %t.out %} +// RUN: %if linux && (level_zero || cuda) %{ env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 FileCheck %s %} %else %{ %{run} %t.out %} // REQUIRES: aspect-usm_shared_allocations diff --git a/sycl/test-e2e/Graph/RecordReplay/prefetch.cpp b/sycl/test-e2e/Graph/RecordReplay/prefetch.cpp index 68d78ee23c0da..23f16d4d49127 100644 --- a/sycl/test-e2e/Graph/RecordReplay/prefetch.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/prefetch.cpp @@ -1,5 +1,5 @@ // RUN: %{build} -o %t.out -// RUN: %if linux && (level_zero || cuda) %{ env SYCL_UR_TRACE=1 %{run} %t.out 2>&1 FileCheck %s %} %else %{ %{run} %t.out %} +// RUN: %if linux && (level_zero || cuda) %{ env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 FileCheck %s %} %else %{ %{run} %t.out %} // REQUIRES: aspect-usm_shared_allocations diff --git a/sycl/test-e2e/InorderQueue/in_order_ext_oneapi_submit_barrier.cpp b/sycl/test-e2e/InorderQueue/in_order_ext_oneapi_submit_barrier.cpp index 2fb2739c69958..b2bc1c40fec73 100644 --- a/sycl/test-e2e/InorderQueue/in_order_ext_oneapi_submit_barrier.cpp +++ b/sycl/test-e2e/InorderQueue/in_order_ext_oneapi_submit_barrier.cpp @@ -1,5 +1,5 @@ // RUN: %{build} -o %t.out -// RUN: env SYCL_UR_TRACE=1 %{run} %t.out 2>&1 | FileCheck %s +// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s // Test to check that we don't insert unnecessary urEnqueueEventsWaitWithBarrier // calls if queue is in-order and wait list is empty. diff --git a/sycl/test-e2e/KernelAndProgram/cache_env_vars.cpp b/sycl/test-e2e/KernelAndProgram/cache_env_vars.cpp index ddbd9eceaead1..852ec3ed9df54 100644 --- a/sycl/test-e2e/KernelAndProgram/cache_env_vars.cpp +++ b/sycl/test-e2e/KernelAndProgram/cache_env_vars.cpp @@ -3,15 +3,15 @@ // RUN: rm -rf %t/cache_dir // RUN: %{build} -o %t.out -DTARGET_IMAGE=INC100 // Build program and add item to cache -// RUN: env SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_UR_TRACE=1 %{run} %t.out | FileCheck %s --check-prefixes=CHECK-BUILD +// RUN: env SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_UR_TRACE=2 %{run} %t.out | FileCheck %s --check-prefixes=CHECK-BUILD // Ignore caching because image size is less than threshold -// RUN: env SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_UR_TRACE=1 SYCL_CACHE_MIN_DEVICE_IMAGE_SIZE=1000000 %{run} %t.out | FileCheck %s --check-prefixes=CHECK-BUILD +// RUN: env SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_UR_TRACE=2 SYCL_CACHE_MIN_DEVICE_IMAGE_SIZE=1000000 %{run} %t.out | FileCheck %s --check-prefixes=CHECK-BUILD // Ignore caching because image size is more than threshold -// RUN: env SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_UR_TRACE=1 SYCL_CACHE_MAX_DEVICE_IMAGE_SIZE=1000 %{run} %t.out | FileCheck %s --check-prefixes=CHECK-BUILD +// RUN: env SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_UR_TRACE=2 SYCL_CACHE_MAX_DEVICE_IMAGE_SIZE=1000 %{run} %t.out | FileCheck %s --check-prefixes=CHECK-BUILD // Use cache -// RUN: env SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_UR_TRACE=1 %{run} %t.out | FileCheck %s --check-prefixes=CHECK-CACHE +// RUN: env SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_UR_TRACE=2 %{run} %t.out | FileCheck %s --check-prefixes=CHECK-CACHE // Ignore cache because of environment variable -// RUN: env SYCL_CACHE_PERSISTENT=0 SYCL_CACHE_DIR=%t/cache_dir SYCL_UR_TRACE=1 %{run} %t.out | FileCheck %s --check-prefixes=CHECK-BUILD +// RUN: env SYCL_CACHE_PERSISTENT=0 SYCL_CACHE_DIR=%t/cache_dir SYCL_UR_TRACE=2 %{run} %t.out | FileCheck %s --check-prefixes=CHECK-BUILD // // The test checks environment variables which may disable caching. // Also it can be used for benchmarking cache: @@ -22,8 +22,7 @@ // CPU OCL JIT 0.12 0.12 0.16 1.1 16 // CPU OCL Cache 0.01 0.01 0.01 0.02 0.08 - -// Some backends will call urProgramBuild and some will call +// Some backends will call urProgramBuild and some will call // urProgramBuildExp depending on urProgramBuildExp support. // CHECK-BUILD-NOT: urProgramCreateWithBinary( diff --git a/sycl/test-e2e/KernelAndProgram/cache_env_vars_lin.cpp b/sycl/test-e2e/KernelAndProgram/cache_env_vars_lin.cpp index 8046b1af7d653..e43ed543ba5d2 100644 --- a/sycl/test-e2e/KernelAndProgram/cache_env_vars_lin.cpp +++ b/sycl/test-e2e/KernelAndProgram/cache_env_vars_lin.cpp @@ -7,20 +7,20 @@ // When no environment variables pointing cache directory are set the cache is // disabled -// RUN: env SYCL_CACHE_PERSISTENT=1 env -u SYCL_CACHE_DIR env -u HOME env -u XDG_CACHE_HOME SYCL_UR_TRACE=1 %{run} %t.out | FileCheck %s --check-prefixes=CHECK-BUILD -// RUN: env SYCL_CACHE_PERSISTENT=1 env -u SYCL_CACHE_DIR env -u HOME env -u XDG_CACHE_HOME SYCL_UR_TRACE=1 %{run} %t.out | FileCheck %s --check-prefixes=CHECK-BUILD +// RUN: env SYCL_CACHE_PERSISTENT=1 env -u SYCL_CACHE_DIR env -u HOME env -u XDG_CACHE_HOME SYCL_UR_TRACE=2 %{run} %t.out | FileCheck %s --check-prefixes=CHECK-BUILD +// RUN: env SYCL_CACHE_PERSISTENT=1 env -u SYCL_CACHE_DIR env -u HOME env -u XDG_CACHE_HOME SYCL_UR_TRACE=2 %{run} %t.out | FileCheck %s --check-prefixes=CHECK-BUILD // When any of environment variables pointing to cache root is present cache is // enabled // RUN: rm -rf %t/cache_dir -// RUN: env SYCL_CACHE_PERSISTENT=1 XDG_CACHE_HOME=%t/cache_dir SYCL_UR_TRACE=1 env -u SYCL_CACHE_DIR env -u HOME %{run} %t.out | FileCheck %s --check-prefixes=CHECK-BUILD -// RUN: env SYCL_CACHE_PERSISTENT=1 XDG_CACHE_HOME=%t/cache_dir SYCL_UR_TRACE=1 env -u SYCL_CACHE_DIR env -u HOME %{run} %t.out | FileCheck %s --check-prefixes=CHECK-CACHE +// RUN: env SYCL_CACHE_PERSISTENT=1 XDG_CACHE_HOME=%t/cache_dir SYCL_UR_TRACE=2 env -u SYCL_CACHE_DIR env -u HOME %{run} %t.out | FileCheck %s --check-prefixes=CHECK-BUILD +// RUN: env SYCL_CACHE_PERSISTENT=1 XDG_CACHE_HOME=%t/cache_dir SYCL_UR_TRACE=2 env -u SYCL_CACHE_DIR env -u HOME %{run} %t.out | FileCheck %s --check-prefixes=CHECK-CACHE // RUN: rm -rf %t/cache_dir -// RUN: env SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_UR_TRACE=1 env -u XDG_CACHE_HOME env -u HOME %{run} %t.out | FileCheck %s --check-prefixes=CHECK-BUILD -// RUN: env SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_UR_TRACE=1 env -u XDG_CACHE_HOME env -u HOME %{run} %t.out | FileCheck %s --check-prefixes=CHECK-CACHE +// RUN: env SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_UR_TRACE=2 env -u XDG_CACHE_HOME env -u HOME %{run} %t.out | FileCheck %s --check-prefixes=CHECK-BUILD +// RUN: env SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_UR_TRACE=2 env -u XDG_CACHE_HOME env -u HOME %{run} %t.out | FileCheck %s --check-prefixes=CHECK-CACHE // RUN: rm -rf %t/cache_dir -// RUN: env SYCL_CACHE_PERSISTENT=1 HOME=%t/cache_dir SYCL_UR_TRACE=1 env -u XDG_CACHE_HOME env -u SYCL_CACHE_DIR %{run} %t.out | FileCheck %s --check-prefixes=CHECK-BUILD -// RUN: env SYCL_CACHE_PERSISTENT=1 HOME=%t/cache_dir SYCL_UR_TRACE=1 env -u XDG_CACHE_HOME env -u SYCL_CACHE_DIR %{run} %t.out | FileCheck %s --check-prefixes=CHECK-CACHE +// RUN: env SYCL_CACHE_PERSISTENT=1 HOME=%t/cache_dir SYCL_UR_TRACE=2 env -u XDG_CACHE_HOME env -u SYCL_CACHE_DIR %{run} %t.out | FileCheck %s --check-prefixes=CHECK-BUILD +// RUN: env SYCL_CACHE_PERSISTENT=1 HOME=%t/cache_dir SYCL_UR_TRACE=2 env -u XDG_CACHE_HOME env -u SYCL_CACHE_DIR %{run} %t.out | FileCheck %s --check-prefixes=CHECK-CACHE // Some backends will call urProgramBuild and some will call urProgramBuildExp depending on urProgramBuildExp support. diff --git a/sycl/test-e2e/KernelAndProgram/cache_env_vars_win.cpp b/sycl/test-e2e/KernelAndProgram/cache_env_vars_win.cpp index 438cf9646321f..064db1e734014 100644 --- a/sycl/test-e2e/KernelAndProgram/cache_env_vars_win.cpp +++ b/sycl/test-e2e/KernelAndProgram/cache_env_vars_win.cpp @@ -7,17 +7,17 @@ // When no environment variables pointing cache directory are set the cache is // disabled -// RUN: env SYCL_CACHE_PERSISTENT=1 env -u SYCL_CACHE_DIR env -u AppData SYCL_UR_TRACE=1 %t.out | FileCheck %s --check-prefixes=CHECK-BUILD -// RUN: env SYCL_CACHE_PERSISTENT=1 env -u SYCL_CACHE_DIR env -u AppData SYCL_UR_TRACE=1 %t.out | FileCheck %s --check-prefixes=CHECK-BUILD +// RUN: env SYCL_CACHE_PERSISTENT=1 env -u SYCL_CACHE_DIR env -u AppData SYCL_UR_TRACE=2 %t.out | FileCheck %s --check-prefixes=CHECK-BUILD +// RUN: env SYCL_CACHE_PERSISTENT=1 env -u SYCL_CACHE_DIR env -u AppData SYCL_UR_TRACE=2 %t.out | FileCheck %s --check-prefixes=CHECK-BUILD // When any of environment variables pointing to cache root is present cache is // enabled // RUN: rm -rf %t/cache_dir -// RUN: env SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_UR_TRACE=1 env -u AppData %t.out | FileCheck %s --check-prefixes=CHECK-BUILD -// RUN: env SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_UR_TRACE=1 env -u AppData %t.out %t.out | FileCheck %s --check-prefixes=CHECK-CACHE +// RUN: env SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_UR_TRACE=2 env -u AppData %t.out | FileCheck %s --check-prefixes=CHECK-BUILD +// RUN: env SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_UR_TRACE=2 env -u AppData %t.out %t.out | FileCheck %s --check-prefixes=CHECK-CACHE // RUN: rm -rf %t/cache_dir -// RUN: env SYCL_CACHE_PERSISTENT=1 AppData=%t/cache_dir SYCL_UR_TRACE=1 env -u SYCL_CACHE_DIR %t.out | FileCheck %s --check-prefixes=CHECK-BUILD -// RUN: env SYCL_CACHE_PERSISTENT=1 AppData=%t/cache_dir SYCL_UR_TRACE=1 env -u SYCL_CACHE_DIR %t.out | FileCheck %s --check-prefixes=CHECK-CACHE +// RUN: env SYCL_CACHE_PERSISTENT=1 AppData=%t/cache_dir SYCL_UR_TRACE=2 env -u SYCL_CACHE_DIR %t.out | FileCheck %s --check-prefixes=CHECK-BUILD +// RUN: env SYCL_CACHE_PERSISTENT=1 AppData=%t/cache_dir SYCL_UR_TRACE=2 env -u SYCL_CACHE_DIR %t.out | FileCheck %s --check-prefixes=CHECK-CACHE // CHECK-BUILD-NOT: urProgramCreateWithBinary( // CHECK-BUILD: urProgramCreateWithIL( diff --git a/sycl/test-e2e/KernelAndProgram/disable-caching.cpp b/sycl/test-e2e/KernelAndProgram/disable-caching.cpp index a84fde4d39d42..5e8ef4045d641 100644 --- a/sycl/test-e2e/KernelAndProgram/disable-caching.cpp +++ b/sycl/test-e2e/KernelAndProgram/disable-caching.cpp @@ -2,9 +2,9 @@ // if and only if caching is disabled. // RUN: %{build} -o %t.out -// RUN: env ZE_DEBUG=-6 SYCL_UR_TRACE=1 SYCL_CACHE_IN_MEM=0 %{run} %t.out \ +// RUN: env ZE_DEBUG=-6 SYCL_UR_TRACE=2 SYCL_CACHE_IN_MEM=0 %{run} %t.out \ // RUN: | FileCheck %s -// RUN: env ZE_DEBUG=-6 SYCL_UR_TRACE=1 %{run} %t.out \ +// RUN: env ZE_DEBUG=-6 SYCL_UR_TRACE=2 %{run} %t.out \ // RUN: | FileCheck %s --check-prefixes=CHECK-CACHE // TODO: Reenable on Windows, see https://github.com/intel/llvm/issues/14768 diff --git a/sycl/test-e2e/KernelAndProgram/kernel-bundle-merge-options-env.cpp b/sycl/test-e2e/KernelAndProgram/kernel-bundle-merge-options-env.cpp index d41e188cc2b0c..698b241d98c90 100644 --- a/sycl/test-e2e/KernelAndProgram/kernel-bundle-merge-options-env.cpp +++ b/sycl/test-e2e/KernelAndProgram/kernel-bundle-merge-options-env.cpp @@ -1,10 +1,10 @@ // REQUIRES: gpu // Disable fallback assert here so, that build process isn't affected // RUN: %{build} -DSYCL_DISABLE_FALLBACK_ASSERT=1 -o %t.out %debug_option -// RUN: env SYCL_UR_TRACE=1 SYCL_PROGRAM_COMPILE_OPTIONS=-DENV_COMPILE_OPTS SYCL_PROGRAM_LINK_OPTIONS=-DENV_LINK_OPTS SYCL_PROGRAM_APPEND_COMPILE_OPTIONS=-DENV_APPEND_COMPILE_OPTS SYCL_PROGRAM_APPEND_LINK_OPTIONS=-DENV_APPEND_LINK_OPTS %{run} %t.out | FileCheck %s +// RUN: env SYCL_UR_TRACE=2 SYCL_PROGRAM_COMPILE_OPTIONS=-DENV_COMPILE_OPTS SYCL_PROGRAM_LINK_OPTIONS=-DENV_LINK_OPTS SYCL_PROGRAM_APPEND_COMPILE_OPTIONS=-DENV_APPEND_COMPILE_OPTS SYCL_PROGRAM_APPEND_LINK_OPTIONS=-DENV_APPEND_LINK_OPTS %{run} %t.out | FileCheck %s // Check that options are overrided // RUN: %{build} -Wno-error=unused-command-line-argument -DSYCL_DISABLE_FALLBACK_ASSERT=1 -Xsycl-target-linker=spir64 -DBAR -Xsycl-target-frontend=spir64 -DBAR_COMPILE -o %t.out -// RUN: env SYCL_UR_TRACE=1 SYCL_PROGRAM_COMPILE_OPTIONS=-DENV_COMPILE_OPTS SYCL_PROGRAM_LINK_OPTIONS=-DENV_LINK_OPTS SYCL_PROGRAM_APPEND_COMPILE_OPTIONS=-DENV_APPEND_COMPILE_OPTS SYCL_PROGRAM_APPEND_LINK_OPTIONS=-DENV_APPEND_LINK_OPTS %{run} %t.out | FileCheck %s +// RUN: env SYCL_UR_TRACE=2 SYCL_PROGRAM_COMPILE_OPTIONS=-DENV_COMPILE_OPTS SYCL_PROGRAM_LINK_OPTIONS=-DENV_LINK_OPTS SYCL_PROGRAM_APPEND_COMPILE_OPTIONS=-DENV_APPEND_COMPILE_OPTS SYCL_PROGRAM_APPEND_LINK_OPTIONS=-DENV_APPEND_LINK_OPTS %{run} %t.out | FileCheck %s // UNSUPPORTED: hip #include "kernel-bundle-merge-options.hpp" diff --git a/sycl/test-e2e/KernelAndProgram/kernel-bundle-merge-options.cpp b/sycl/test-e2e/KernelAndProgram/kernel-bundle-merge-options.cpp index 2662323d365e7..2405014814339 100644 --- a/sycl/test-e2e/KernelAndProgram/kernel-bundle-merge-options.cpp +++ b/sycl/test-e2e/KernelAndProgram/kernel-bundle-merge-options.cpp @@ -1,6 +1,6 @@ // REQUIRES: gpu // RUN: %{build} -o %t.out %debug_option -// RUN: env SYCL_UR_TRACE=1 %{run} %t.out | FileCheck %s +// 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 diff --git a/sycl/test-e2e/KernelAndProgram/level-zero-static-link-flow.cpp b/sycl/test-e2e/KernelAndProgram/level-zero-static-link-flow.cpp index c13cf39e41847..2360554318092 100644 --- a/sycl/test-e2e/KernelAndProgram/level-zero-static-link-flow.cpp +++ b/sycl/test-e2e/KernelAndProgram/level-zero-static-link-flow.cpp @@ -1,7 +1,7 @@ // REQUIRES: level_zero // UNSUPPORTED: ze_debug // RUN: %{build} -o %t.out -// RUN: env SYCL_UR_TRACE=1 UR_L0_DEBUG=1 %{run} %t.out 2>&1 | FileCheck %s +// RUN: env SYCL_UR_TRACE=2 UR_L0_DEBUG=1 %{run} %t.out 2>&1 | FileCheck %s // //==--- level-zero-static-link-flow.cpp.cpp - Check L0 static link flow --==// // diff --git a/sycl/test-e2e/KernelAndProgram/target_compile_fast.cpp b/sycl/test-e2e/KernelAndProgram/target_compile_fast.cpp index 0e0fd4ffb0693..40dfb6ed26d2e 100644 --- a/sycl/test-e2e/KernelAndProgram/target_compile_fast.cpp +++ b/sycl/test-e2e/KernelAndProgram/target_compile_fast.cpp @@ -1,8 +1,8 @@ // RUN: %{build} -Wno-error=unused-command-line-argument -ftarget-compile-fast -o %t_with.out // RUN: %{build} -o %t_without.out -// RUN: env SYCL_UR_TRACE=1 %{run} %t_with.out 2>&1 | FileCheck %if !gpu || hip || cuda %{ --check-prefix=CHECK-WITHOUT %} %else %{ --check-prefix=CHECK-INTEL-GPU-WITH %} %s -// RUN: env SYCL_UR_TRACE=1 %{run} %t_without.out 2>&1 | FileCheck --implicit-check-not=-igc_opts %s +// RUN: env SYCL_UR_TRACE=2 %{run} %t_with.out 2>&1 | FileCheck %if !gpu || hip || cuda %{ --check-prefix=CHECK-WITHOUT %} %else %{ --check-prefix=CHECK-INTEL-GPU-WITH %} %s +// RUN: env SYCL_UR_TRACE=2 %{run} %t_without.out 2>&1 | FileCheck --implicit-check-not=-igc_opts %s // CHECK-INTEL-GPU-WITH: ---> urProgramBuild // CHECK-INTEL-GPU-WITH-SAME: -igc_opts 'PartitionUnit=1,SubroutineThreshold=50000' diff --git a/sycl/test-e2e/KernelAndProgram/target_register_alloc_mode.cpp b/sycl/test-e2e/KernelAndProgram/target_register_alloc_mode.cpp index f6e2d00e15af8..c71a929b7dbd3 100644 --- a/sycl/test-e2e/KernelAndProgram/target_register_alloc_mode.cpp +++ b/sycl/test-e2e/KernelAndProgram/target_register_alloc_mode.cpp @@ -4,9 +4,9 @@ // RUN: %{build} -o %t_without.out // RUN: %{build} -ftarget-register-alloc-mode=pvc:default -o %t_default.out -// RUN: env SYCL_UR_TRACE=1 %{run} %t_with.out 2>&1 | FileCheck --check-prefix=CHECK-OPT %s -// RUN: env SYCL_UR_TRACE=1 %{run} %t_without.out 2>&1 | FileCheck %if system-windows %{ --implicit-check-not=-ze-intel-enable-auto-large-GRF-mode %} %else %{ --check-prefix=CHECK-OPT %} %s -// RUN: env SYCL_UR_TRACE=1 %{run} %t_default.out 2>&1 | FileCheck --implicit-check-not=-ze-intel-enable-auto-large-GRF-mode %s +// RUN: env SYCL_UR_TRACE=2 %{run} %t_with.out 2>&1 | FileCheck --check-prefix=CHECK-OPT %s +// RUN: env SYCL_UR_TRACE=2 %{run} %t_without.out 2>&1 | FileCheck %if system-windows %{ --implicit-check-not=-ze-intel-enable-auto-large-GRF-mode %} %else %{ --check-prefix=CHECK-OPT %} %s +// RUN: env SYCL_UR_TRACE=2 %{run} %t_default.out 2>&1 | FileCheck --implicit-check-not=-ze-intel-enable-auto-large-GRF-mode %s // CHECK-OPT: ---> urProgramBuild( // CHECK-SAME-OPT: -ze-intel-enable-auto-large-GRF-mode diff --git a/sycl/test-e2e/Plugin/adapter-release.cpp b/sycl/test-e2e/Plugin/adapter-release.cpp index 265c2d7af0eba..66e78acd385a5 100644 --- a/sycl/test-e2e/Plugin/adapter-release.cpp +++ b/sycl/test-e2e/Plugin/adapter-release.cpp @@ -1,4 +1,4 @@ // ensure that urAdapterRelease is called -// RUN: env SYCL_UR_TRACE=1 sycl-ls | FileCheck %s +// RUN: env SYCL_UR_TRACE=2 sycl-ls | FileCheck %s // CHECK: ---> urAdapterRelease diff --git a/sycl/test-e2e/Plugin/dll-detach-order.cpp b/sycl/test-e2e/Plugin/dll-detach-order.cpp index e827669dcaf8f..51beb5710d9e5 100644 --- a/sycl/test-e2e/Plugin/dll-detach-order.cpp +++ b/sycl/test-e2e/Plugin/dll-detach-order.cpp @@ -1,5 +1,5 @@ // REQUIRES: windows -// RUN: env SYCL_UR_TRACE=1 sycl-ls | FileCheck %s +// RUN: env SYCL_UR_TRACE=-1 sycl-ls | FileCheck %s // ensure that the plugins are detached AFTER urLoaderTearDown is done executing diff --git a/sycl/test-e2e/Plugin/enqueue-arg-order-buffer.cpp b/sycl/test-e2e/Plugin/enqueue-arg-order-buffer.cpp index 387b72fb2dbb8..e3b0ac1ed6e44 100644 --- a/sycl/test-e2e/Plugin/enqueue-arg-order-buffer.cpp +++ b/sycl/test-e2e/Plugin/enqueue-arg-order-buffer.cpp @@ -1,6 +1,6 @@ // UNSUPPORTED: hip_nvidia // RUN: %{build} -Wno-error=deprecated-declarations -o %t.out -// RUN: env SYCL_UR_TRACE=1 %{run} %t.out | FileCheck %s +// RUN: env SYCL_UR_TRACE=2 %{run} %t.out | FileCheck %s #include diff --git a/sycl/test-e2e/Plugin/enqueue-arg-order-image.cpp b/sycl/test-e2e/Plugin/enqueue-arg-order-image.cpp index 85eb7aa5d3600..8308dda453d66 100644 --- a/sycl/test-e2e/Plugin/enqueue-arg-order-image.cpp +++ b/sycl/test-e2e/Plugin/enqueue-arg-order-image.cpp @@ -10,7 +10,7 @@ // RUN: %{build} -o %t.out // Native images are created with host pointers only with host unified memory // support, enforce it for this test. -// RUN: env SYCL_HOST_UNIFIED_MEMORY=1 SYCL_UR_TRACE=1 %{run} %t.out | FileCheck %s +// RUN: env SYCL_HOST_UNIFIED_MEMORY=1 SYCL_UR_TRACE=2 %{run} %t.out | FileCheck %s #include diff --git a/sycl/test-e2e/Plugin/level_zero_barrier_optimization.cpp b/sycl/test-e2e/Plugin/level_zero_barrier_optimization.cpp index 284227ee0a630..e10467da96f7b 100644 --- a/sycl/test-e2e/Plugin/level_zero_barrier_optimization.cpp +++ b/sycl/test-e2e/Plugin/level_zero_barrier_optimization.cpp @@ -1,6 +1,6 @@ // REQUIRES: level_zero // RUN: %{build} -o %t.out -// RUN: env SYCL_UR_TRACE=1 UR_L0_DEBUG=1 %{run} %t.out 2>&1 | FileCheck %s +// RUN: env SYCL_UR_TRACE=2 UR_L0_DEBUG=1 %{run} %t.out 2>&1 | FileCheck %s // Test to check that we don't insert unnecessary L0 commands for // queue::ext_oneapi_submit_barrier() when we have in-order queue. diff --git a/sycl/test-e2e/Plugin/level_zero_batch_barrier.cpp b/sycl/test-e2e/Plugin/level_zero_batch_barrier.cpp index 73c8d1931abbe..195378420d474 100644 --- a/sycl/test-e2e/Plugin/level_zero_batch_barrier.cpp +++ b/sycl/test-e2e/Plugin/level_zero_batch_barrier.cpp @@ -1,7 +1,7 @@ // REQUIRES: gpu, level_zero, level_zero_dev_kit // RUN: %{build} %level_zero_options -o %t.out -// RUN: env SYCL_UR_TRACE=1 UR_L0_DEBUG=1 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{run} %t.out 2>&1 | FileCheck %s +// RUN: env SYCL_UR_TRACE=2 UR_L0_DEBUG=1 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{run} %t.out 2>&1 | FileCheck %s // Test that the wait with a barrier is fully batched, i.e. it doesn't cause // extra submissions. diff --git a/sycl/test-e2e/Plugin/level_zero_batch_event_status.cpp b/sycl/test-e2e/Plugin/level_zero_batch_event_status.cpp index 3e8a6fc2e4e3c..4f4ad87022dbf 100644 --- a/sycl/test-e2e/Plugin/level_zero_batch_event_status.cpp +++ b/sycl/test-e2e/Plugin/level_zero_batch_event_status.cpp @@ -4,7 +4,7 @@ // RUN: %{build} -o %t.out // Set batching to 4 explicitly -// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=4 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=1 UR_L0_DEBUG=1 %{run} %t.out 2>&1 | FileCheck %s +// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=4 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=2 UR_L0_DEBUG=1 %{run} %t.out 2>&1 | FileCheck %s // level_zero_batch_test.cpp // diff --git a/sycl/test-e2e/Plugin/level_zero_batch_test.cpp b/sycl/test-e2e/Plugin/level_zero_batch_test.cpp index 4c384cf78c5d4..792090a35e481 100644 --- a/sycl/test-e2e/Plugin/level_zero_batch_test.cpp +++ b/sycl/test-e2e/Plugin/level_zero_batch_test.cpp @@ -7,69 +7,69 @@ // To test batching on out-of-order queue: // Set batching to 4 explicitly -// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=4 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=1 UR_L0_DEBUG=1 %{run} %t.ooo.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB4 %s +// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=4 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=2 UR_L0_DEBUG=1 %{run} %t.ooo.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB4 %s // Set batching to 1 explicitly -// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=1 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=1 UR_L0_DEBUG=1 %{run} %t.ooo.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB1 %s +// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=1 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=2 UR_L0_DEBUG=1 %{run} %t.ooo.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB1 %s // Set batching to 3 explicitly -// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=3 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=1 UR_L0_DEBUG=1 %{run} %t.ooo.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB3 %s +// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=3 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=2 UR_L0_DEBUG=1 %{run} %t.ooo.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB3 %s // Set batching to 5 explicitly -// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=5 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=1 UR_L0_DEBUG=1 %{run} %t.ooo.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB5 %s +// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=5 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=2 UR_L0_DEBUG=1 %{run} %t.ooo.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB5 %s // Set batching to 7 explicitly -// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=7 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=1 UR_L0_DEBUG=1 %{run} %t.ooo.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB7 %s +// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=7 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=2 UR_L0_DEBUG=1 %{run} %t.ooo.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB7 %s // Set batching to 8 explicitly -// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=8 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=1 UR_L0_DEBUG=1 %{run} %t.ooo.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB8 %s +// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=8 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=2 UR_L0_DEBUG=1 %{run} %t.ooo.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB8 %s // Set batching to 9 explicitly -// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=9 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=1 UR_L0_DEBUG=1 %{run} %t.ooo.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB9 %s +// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=9 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=2 UR_L0_DEBUG=1 %{run} %t.ooo.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB9 %s // To test batching on in-order queue: // Set batching to 4 explicitly -// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=4 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=1 UR_L0_DEBUG=1 %{run} %t.ino.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB4 %s +// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=4 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=2 UR_L0_DEBUG=1 %{run} %t.ino.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB4 %s // Set batching to 1 explicitly -// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=1 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=1 UR_L0_DEBUG=1 %{run} %t.ino.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB1 %s +// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=1 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=2 UR_L0_DEBUG=1 %{run} %t.ino.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB1 %s // Set batching to 3 explicitly -// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=3 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=1 UR_L0_DEBUG=1 %{run} %t.ino.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB3 %s +// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=3 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=2 UR_L0_DEBUG=1 %{run} %t.ino.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB3 %s // Set batching to 5 explicitly -// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=5 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=1 UR_L0_DEBUG=1 %{run} %t.ino.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB5 %s +// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=5 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=2 UR_L0_DEBUG=1 %{run} %t.ino.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB5 %s // Set batching to 7 explicitly -// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=7 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=1 UR_L0_DEBUG=1 %{run} %t.ino.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB7 %s +// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=7 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=2 UR_L0_DEBUG=1 %{run} %t.ino.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB7 %s // Set batching to 8 explicitly -// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=8 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=1 UR_L0_DEBUG=1 %{run} %t.ino.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB8 %s +// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=8 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=2 UR_L0_DEBUG=1 %{run} %t.ino.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB8 %s // Set batching to 9 explicitly -// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=9 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=1 UR_L0_DEBUG=1 %{run} %t.ino.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB9 %s +// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=9 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=2 UR_L0_DEBUG=1 %{run} %t.ino.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB9 %s // To test batching on in-order queue with discard_events: // Set batching to 4 explicitly -// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=4 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=1 UR_L0_DEBUG=1 %{run} %t.discard_events.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB4 %s +// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=4 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=2 UR_L0_DEBUG=1 %{run} %t.discard_events.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB4 %s // Set batching to 1 explicitly -// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=1 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=1 UR_L0_DEBUG=1 %{run} %t.discard_events.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB1 %s +// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=1 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=2 UR_L0_DEBUG=1 %{run} %t.discard_events.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB1 %s // Set batching to 3 explicitly -// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=3 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=1 UR_L0_DEBUG=1 %{run} %t.discard_events.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB3 %s +// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=3 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=2 UR_L0_DEBUG=1 %{run} %t.discard_events.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB3 %s // Set batching to 5 explicitly -// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=5 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=1 UR_L0_DEBUG=1 %{run} %t.discard_events.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB5 %s +// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=5 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=2 UR_L0_DEBUG=1 %{run} %t.discard_events.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB5 %s // Set batching to 7 explicitly -// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=7 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=1 UR_L0_DEBUG=1 %{run} %t.discard_events.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB7 %s +// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=7 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=2 UR_L0_DEBUG=1 %{run} %t.discard_events.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB7 %s // Set batching to 8 explicitly -// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=8 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=1 UR_L0_DEBUG=1 %{run} %t.discard_events.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB8 %s +// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=8 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=2 UR_L0_DEBUG=1 %{run} %t.discard_events.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB8 %s // Set batching to 9 explicitly -// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=9 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=1 UR_L0_DEBUG=1 %{run} %t.discard_events.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB9 %s +// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=9 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=2 UR_L0_DEBUG=1 %{run} %t.discard_events.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB9 %s // level_zero_batch_test.cpp // diff --git a/sycl/test-e2e/Plugin/level_zero_batch_test_copy_with_compute.cpp b/sycl/test-e2e/Plugin/level_zero_batch_test_copy_with_compute.cpp index 72a6cb44379fb..2ebe6aa0c748a 100644 --- a/sycl/test-e2e/Plugin/level_zero_batch_test_copy_with_compute.cpp +++ b/sycl/test-e2e/Plugin/level_zero_batch_test_copy_with_compute.cpp @@ -4,25 +4,25 @@ // RUN: %{build} -o %t.out // Set batching to 4 explicitly -// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=4 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=1 UR_L0_DEBUG=1 %{run} %t.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB4 %s +// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=4 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=2 UR_L0_DEBUG=1 %{run} %t.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB4 %s // Set batching to 1 explicitly -// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=1 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=1 UR_L0_DEBUG=1 %{run} %t.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB1 %s +// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=1 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=2 UR_L0_DEBUG=1 %{run} %t.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB1 %s // Set batching to 3 explicitly -// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=3 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=1 UR_L0_DEBUG=1 %{run} %t.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB3 %s +// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=3 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=2 UR_L0_DEBUG=1 %{run} %t.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB3 %s // Set batching to 5 explicitly -// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=5 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=1 UR_L0_DEBUG=1 %{run} %t.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB5 %s +// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=5 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=2 UR_L0_DEBUG=1 %{run} %t.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB5 %s // Set batching to 7 explicitly -// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=7 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=1 UR_L0_DEBUG=1 %{run} %t.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB7 %s +// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=7 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=2 UR_L0_DEBUG=1 %{run} %t.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB7 %s // Set batching to 8 explicitly -// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=8 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=1 UR_L0_DEBUG=1 %{run} %t.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB8 %s +// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=8 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=2 UR_L0_DEBUG=1 %{run} %t.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB8 %s // Set batching to 9 explicitly -// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=9 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=1 UR_L0_DEBUG=1 %{run} %t.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB9 %s +// RUN: env SYCL_PI_LEVEL_ZERO_BATCH_SIZE=9 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_UR_TRACE=2 UR_L0_DEBUG=1 %{run} %t.out 2>&1 | FileCheck --check-prefixes=CKALL,CKB9 %s // level_zero_batch_test_copy_with_compute.cpp // diff --git a/sycl/test-e2e/Plugin/level_zero_device_scope_events.cpp b/sycl/test-e2e/Plugin/level_zero_device_scope_events.cpp index 1d9f0850cd3b8..503d7a5297b7f 100644 --- a/sycl/test-e2e/Plugin/level_zero_device_scope_events.cpp +++ b/sycl/test-e2e/Plugin/level_zero_device_scope_events.cpp @@ -1,8 +1,8 @@ // REQUIRES: gpu, level_zero // RUN: %{build} -o %t.out -// RUN: env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=1 SYCL_UR_TRACE=1 UR_L0_DEBUG=1 %{run} %t.out 2>&1 | FileCheck --check-prefixes=MODE1 %s -// RUN: env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_UR_TRACE=1 UR_L0_DEBUG=1 %{run} %t.out 2>&1 | FileCheck --check-prefixes=MODE2 %s +// RUN: env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=1 SYCL_UR_TRACE=2 UR_L0_DEBUG=1 %{run} %t.out 2>&1 | FileCheck --check-prefixes=MODE1 %s +// RUN: env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_UR_TRACE=2 UR_L0_DEBUG=1 %{run} %t.out 2>&1 | FileCheck --check-prefixes=MODE2 %s // UNSUPPORTED: ze_debug // Checks that with L0 device-scope events enabled the only host-visible L0 diff --git a/sycl/test-e2e/Plugin/level_zero_dynamic_batch_test.cpp b/sycl/test-e2e/Plugin/level_zero_dynamic_batch_test.cpp index fce6033c04fb0..fbe7d8e27cb55 100644 --- a/sycl/test-e2e/Plugin/level_zero_dynamic_batch_test.cpp +++ b/sycl/test-e2e/Plugin/level_zero_dynamic_batch_test.cpp @@ -6,9 +6,9 @@ // RUN: %{build} -DUSING_DISCARD_EVENTS -o %t.discard_events.out // Check that dynamic batching raises/lowers batch size -// RUN: env SYCL_UR_TRACE=1 UR_L0_DEBUG=1 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{run} %t.ooo.out 2>&1 | FileCheck --check-prefixes=CKALL,CKDYN %s -// RUN: env SYCL_UR_TRACE=1 UR_L0_DEBUG=1 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{run} %t.ino.out 2>&1 | FileCheck --check-prefixes=CKALL,CKDYN %s -// RUN: env SYCL_UR_TRACE=1 UR_L0_DEBUG=1 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{run} %t.discard_events.out 2>&1 | FileCheck --check-prefixes=CKALL,CKDYN %s +// RUN: env SYCL_UR_TRACE=2 UR_L0_DEBUG=1 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{run} %t.ooo.out 2>&1 | FileCheck --check-prefixes=CKALL,CKDYN %s +// RUN: env SYCL_UR_TRACE=2 UR_L0_DEBUG=1 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{run} %t.ino.out 2>&1 | FileCheck --check-prefixes=CKALL,CKDYN %s +// RUN: env SYCL_UR_TRACE=2 UR_L0_DEBUG=1 SYCL_PI_LEVEL_ZERO_DEVICE_SCOPE_EVENTS=2 SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=0 %{run} %t.discard_events.out 2>&1 | FileCheck --check-prefixes=CKALL,CKDYN %s // level_zero_dynamic_batch_test.cpp // diff --git a/sycl/test-e2e/Plugin/level_zero_usm_device_read_only.cpp b/sycl/test-e2e/Plugin/level_zero_usm_device_read_only.cpp index 00ab16ae7c40f..3fe33410f6360 100644 --- a/sycl/test-e2e/Plugin/level_zero_usm_device_read_only.cpp +++ b/sycl/test-e2e/Plugin/level_zero_usm_device_read_only.cpp @@ -2,7 +2,7 @@ // UNSUPPORTED: ze_debug // RUN: %{build} -o %t.out -// RUN: env SYCL_UR_TRACE=1 UR_L0_DEBUG=1 %{run} %t.out 2>&1 | FileCheck %s +// RUN: env SYCL_UR_TRACE=2 UR_L0_DEBUG=1 %{run} %t.out 2>&1 | FileCheck %s // Test that "device_read_only" shared USM allocations are pooled. diff --git a/sycl/test-e2e/Plugin/level_zero_usm_residency.cpp b/sycl/test-e2e/Plugin/level_zero_usm_residency.cpp index 60dacb11a5fce..95a0314ca29f3 100644 --- a/sycl/test-e2e/Plugin/level_zero_usm_residency.cpp +++ b/sycl/test-e2e/Plugin/level_zero_usm_residency.cpp @@ -1,10 +1,10 @@ // REQUIRES: gpu, level_zero // RUN: %{build} %level_zero_options -o %t.out -// RUN: env SYCL_UR_TRACE=1 UR_L0_DEBUG=-1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck --check-prefixes=DEVICE %s -// RUN: env SYCL_PI_LEVEL_ZERO_USM_RESIDENT=0x001 SYCL_UR_TRACE=1 UR_L0_DEBUG=-1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck --check-prefixes=DEVICE %s -// RUN: env SYCL_PI_LEVEL_ZERO_USM_RESIDENT=0x010 SYCL_UR_TRACE=1 UR_L0_DEBUG=-1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck --check-prefixes=SHARED %s -// RUN: env SYCL_PI_LEVEL_ZERO_USM_RESIDENT=0x100 SYCL_UR_TRACE=1 UR_L0_DEBUG=-1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck --check-prefixes=HOST %s +// RUN: env SYCL_UR_TRACE=2 UR_L0_DEBUG=-1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck --check-prefixes=DEVICE %s +// RUN: env SYCL_PI_LEVEL_ZERO_USM_RESIDENT=0x001 SYCL_UR_TRACE=2 UR_L0_DEBUG=-1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck --check-prefixes=DEVICE %s +// RUN: env SYCL_PI_LEVEL_ZERO_USM_RESIDENT=0x010 SYCL_UR_TRACE=2 UR_L0_DEBUG=-1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck --check-prefixes=SHARED %s +// RUN: env SYCL_PI_LEVEL_ZERO_USM_RESIDENT=0x100 SYCL_UR_TRACE=2 UR_L0_DEBUG=-1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck --check-prefixes=HOST %s // Test that USM is made resident at allocation as requested. diff --git a/sycl/test-e2e/PropagateOptionsToBackend/sycl-opt-level-level-zero.cpp b/sycl/test-e2e/PropagateOptionsToBackend/sycl-opt-level-level-zero.cpp index f8884a4982c24..5bed10ff02591 100644 --- a/sycl/test-e2e/PropagateOptionsToBackend/sycl-opt-level-level-zero.cpp +++ b/sycl/test-e2e/PropagateOptionsToBackend/sycl-opt-level-level-zero.cpp @@ -1,13 +1,13 @@ // REQUIRES: level_zero // RUN: %{build} %if cl_options %{/Od%} %else %{-O0%} -o %t0.out -// RUN: env SYCL_UR_TRACE=1 %{run} %t0.out 2>&1 | FileCheck %s --check-prefixes=CHECK0 +// RUN: env SYCL_UR_TRACE=2 %{run} %t0.out 2>&1 | FileCheck %s --check-prefixes=CHECK0 // RUN: %{build} -O1 -o %t1.out -// RUN: env SYCL_UR_TRACE=1 %{run} %t1.out 2>&1 | FileCheck %s --check-prefixes=CHECK1 +// RUN: env SYCL_UR_TRACE=2 %{run} %t1.out 2>&1 | FileCheck %s --check-prefixes=CHECK1 // RUN: %{build} -O2 -o %t2.out -// RUN: env SYCL_UR_TRACE=1 %{run} %t2.out 2>&1 | FileCheck %s --check-prefixes=CHECK1 +// RUN: env SYCL_UR_TRACE=2 %{run} %t2.out 2>&1 | FileCheck %s --check-prefixes=CHECK1 // RUN: %{build} -O3 -o %t3.out -// RUN: env SYCL_UR_TRACE=1 %{run} %t3.out 2>&1 | FileCheck %s --check-prefixes=CHECK1 +// RUN: env SYCL_UR_TRACE=2 %{run} %t3.out 2>&1 | FileCheck %s --check-prefixes=CHECK1 // This test verifies the propagation of front-end compiler optimization // option to the backend. diff --git a/sycl/test-e2e/PropagateOptionsToBackend/sycl-opt-level-opencl.cpp b/sycl/test-e2e/PropagateOptionsToBackend/sycl-opt-level-opencl.cpp index 13f88128ccc27..c2877438392f7 100644 --- a/sycl/test-e2e/PropagateOptionsToBackend/sycl-opt-level-opencl.cpp +++ b/sycl/test-e2e/PropagateOptionsToBackend/sycl-opt-level-opencl.cpp @@ -1,13 +1,13 @@ // REQUIRES: opencl // RUN: %{build} %if cl_options %{/Od%} %else %{-O0%} -o %t0.out -// RUN: %if !acc %{ env SYCL_UR_TRACE=1 %{run} %t0.out 2>&1 | FileCheck %s --check-prefixes=CHECKOCL0 %} +// RUN: %if !acc %{ env SYCL_UR_TRACE=2 %{run} %t0.out 2>&1 | FileCheck %s --check-prefixes=CHECKOCL0 %} // RUN: %{build} -O1 -o %t1.out -// RUN: %if !acc %{ env SYCL_UR_TRACE=1 %{run} %t1.out 2>&1 | FileCheck %s --check-prefixes=CHECKOCL1 %} +// RUN: %if !acc %{ env SYCL_UR_TRACE=2 %{run} %t1.out 2>&1 | FileCheck %s --check-prefixes=CHECKOCL1 %} // RUN: %{build} -O2 -o %t2.out -// RUN: %if !acc %{ env SYCL_UR_TRACE=1 %{run} %t2.out 2>&1 | FileCheck %s --check-prefixes=CHECKOCL2 %} +// RUN: %if !acc %{ env SYCL_UR_TRACE=2 %{run} %t2.out 2>&1 | FileCheck %s --check-prefixes=CHECKOCL2 %} // RUN: %{build} -O3 -o %t3.out -// RUN: %if !acc %{ env SYCL_UR_TRACE=1 %{run} %t3.out 2>&1 | FileCheck %s --check-prefixes=CHECKOCL3 %} +// RUN: %if !acc %{ env SYCL_UR_TRACE=2 %{run} %t3.out 2>&1 | FileCheck %s --check-prefixes=CHECKOCL3 %} // RUN: %{build} -O0 -o %t.out // RUN: %{run} %t.out diff --git a/sycl/test-e2e/Regression/context_is_destroyed_after_exception.cpp b/sycl/test-e2e/Regression/context_is_destroyed_after_exception.cpp index b662101db63ca..703103f0d1a62 100644 --- a/sycl/test-e2e/Regression/context_is_destroyed_after_exception.cpp +++ b/sycl/test-e2e/Regression/context_is_destroyed_after_exception.cpp @@ -1,7 +1,7 @@ // REQUIRES: gpu // RUN: %{build} -o %t.out -// RUN: env SYCL_UR_TRACE=1 %{run} %t.out 2>&1 | FileCheck %s +// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s // // TODO: Reenable on Windows, see https://github.com/intel/llvm/issues/14768 // XFAIL: hip_nvidia, windows diff --git a/sycl/test-e2e/Regression/image_access.cpp b/sycl/test-e2e/Regression/image_access.cpp index c22907934c397..1a89331278691 100644 --- a/sycl/test-e2e/Regression/image_access.cpp +++ b/sycl/test-e2e/Regression/image_access.cpp @@ -1,6 +1,6 @@ // REQUIRES: aspect-ext_intel_legacy_image // RUN: %{build} -o %t.out -// RUN: env SYCL_UR_TRACE=1 %{run} %t.out 2>&1 | FileCheck %s +// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s // // UNSUPPORTED: hip // CUDA doesn't fully support OpenCL spec conform images. diff --git a/sycl/test-e2e/Regression/implicit_kernel_bundle_image_filtering.cpp b/sycl/test-e2e/Regression/implicit_kernel_bundle_image_filtering.cpp index cfe997c8b3f93..0637c9e2a12d3 100644 --- a/sycl/test-e2e/Regression/implicit_kernel_bundle_image_filtering.cpp +++ b/sycl/test-e2e/Regression/implicit_kernel_bundle_image_filtering.cpp @@ -1,5 +1,5 @@ // RUN: %{build} -fsycl-device-code-split=per_kernel -o %t.out -// RUN: env SYCL_UR_TRACE=1 %{run} %t.out 2>&1 | FileCheck %s +// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s // This tests checks that implicitly created kernel_bundles (i.e. through // setting a specialization ID from host) only builds the device image diff --git a/sycl/test-e2e/Regression/pi_release.cpp b/sycl/test-e2e/Regression/pi_release.cpp index 672157024259b..1a28a27d184d9 100644 --- a/sycl/test-e2e/Regression/pi_release.cpp +++ b/sycl/test-e2e/Regression/pi_release.cpp @@ -1,6 +1,6 @@ // REQUIRES: opencl || level_zero || cuda // RUN: %{build} -o %t.out -// RUN: env SYCL_UR_TRACE=1 %{run} %t.out 2>&1 | FileCheck %s +// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s // // TODO: Reenable on Windows, see https://github.com/intel/llvm/issues/14768 // XFAIL: windows diff --git a/sycl/test-e2e/Scheduler/HostAccDestruction.cpp b/sycl/test-e2e/Scheduler/HostAccDestruction.cpp index cea31dc84ddc1..164fc00c167ad 100644 --- a/sycl/test-e2e/Scheduler/HostAccDestruction.cpp +++ b/sycl/test-e2e/Scheduler/HostAccDestruction.cpp @@ -1,5 +1,5 @@ // RUN: %{build} -Wno-error=unused-command-line-argument -fsycl-dead-args-optimization -o %t.out -// RUN: env SYCL_UR_TRACE=1 %{run} %t.out 2>&1 | FileCheck %s +// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s // Windows doesn't yet have full shutdown(). // UNSUPPORTED: ze_debug && windows diff --git a/sycl/test-e2e/Scheduler/InOrderQueueDeps.cpp b/sycl/test-e2e/Scheduler/InOrderQueueDeps.cpp index af35567e09ff0..4c5415631170d 100644 --- a/sycl/test-e2e/Scheduler/InOrderQueueDeps.cpp +++ b/sycl/test-e2e/Scheduler/InOrderQueueDeps.cpp @@ -1,5 +1,5 @@ // RUN: %{build} -o %t.out -// RUN: env SYCL_UR_TRACE=1 %{run} %t.out 2>&1 | FileCheck %s +// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s // // XFAIL: hip_nvidia diff --git a/sycl/test-e2e/Scheduler/MemObjRemapping.cpp b/sycl/test-e2e/Scheduler/MemObjRemapping.cpp index 17ad55733f78e..7d5c1d5895a6f 100644 --- a/sycl/test-e2e/Scheduler/MemObjRemapping.cpp +++ b/sycl/test-e2e/Scheduler/MemObjRemapping.cpp @@ -1,5 +1,5 @@ // RUN: %{build} -Wno-error=deprecated-declarations -o %t.out -// RUN: env SYCL_HOST_UNIFIED_MEMORY=1 SYCL_UR_TRACE=1 %{run} %t.out 2>&1 | FileCheck %s +// RUN: env SYCL_HOST_UNIFIED_MEMORY=1 SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s // // XFAIL: hip_nvidia #include diff --git a/sycl/test-e2e/Scheduler/ReleaseResourcesTest.cpp b/sycl/test-e2e/Scheduler/ReleaseResourcesTest.cpp index c7ca4dde5e5bd..dcd1492b63511 100644 --- a/sycl/test-e2e/Scheduler/ReleaseResourcesTest.cpp +++ b/sycl/test-e2e/Scheduler/ReleaseResourcesTest.cpp @@ -1,5 +1,5 @@ // RUN: %{build} -Wno-error=unused-command-line-argument -fsycl-dead-args-optimization -o %t.out -// RUN: env SYCL_UR_TRACE=1 %{run} %t.out 2>&1 | FileCheck %s +// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s // // TODO: Reenable on Windows, see https://github.com/intel/llvm/issues/14768 // XFAIL: hip_nvidia, windows diff --git a/sycl/test-e2e/Scheduler/SubBufferRemapping.cpp b/sycl/test-e2e/Scheduler/SubBufferRemapping.cpp index f901ac168cf17..350ee806c85eb 100644 --- a/sycl/test-e2e/Scheduler/SubBufferRemapping.cpp +++ b/sycl/test-e2e/Scheduler/SubBufferRemapping.cpp @@ -1,5 +1,5 @@ // RUN: %{build} -o %t.out -// RUN: env SYCL_HOST_UNIFIED_MEMORY=1 env SYCL_UR_TRACE=1 %{run} %t.out | FileCheck %s +// RUN: env SYCL_HOST_UNIFIED_MEMORY=1 env SYCL_UR_TRACE=2 %{run} %t.out | FileCheck %s // sub-buffer host alloca are not mated with device alloca. That linkage occurs // in the parent alloca. this test ensures that any map operations are using the diff --git a/sycl/test-e2e/SharedLib/use_when_link_verify_cache.cpp b/sycl/test-e2e/SharedLib/use_when_link_verify_cache.cpp index d58e9801e9cf2..f9bda47506515 100644 --- a/sycl/test-e2e/SharedLib/use_when_link_verify_cache.cpp +++ b/sycl/test-e2e/SharedLib/use_when_link_verify_cache.cpp @@ -3,10 +3,10 @@ // RUN: %{build} -DBUILD_LIB -fPIC -shared -o %T/lib%basename_t.so // RUN: %{build} -DFOO_FIRST -L%T -o %t.out -l%basename_t -Wl,-rpath=%T -// RUN: env SYCL_UR_TRACE=1 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK-FIRST,CHECK --implicit-check-not=piProgramBuild +// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK-FIRST,CHECK --implicit-check-not=piProgramBuild // RUN: %{build} -L%T -o %t.out -l%basename_t -Wl,-rpath=%T -// RUN: env SYCL_UR_TRACE=1 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK-LAST,CHECK --implicit-check-not=piProgramBuild +// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK-LAST,CHECK --implicit-check-not=piProgramBuild #include diff --git a/sycl/test-e2e/SharedLib/use_with_dlopen_verify_cache.cpp b/sycl/test-e2e/SharedLib/use_with_dlopen_verify_cache.cpp index b4c6820f3dc84..c0631389328be 100644 --- a/sycl/test-e2e/SharedLib/use_with_dlopen_verify_cache.cpp +++ b/sycl/test-e2e/SharedLib/use_with_dlopen_verify_cache.cpp @@ -5,18 +5,18 @@ // DEFINE: %{compile} = %{build} -DFNAME=%basename_t -o %t.out -ldl -Wl,-rpath=%T // RUN: %{compile} -DRUN_FIRST -// RUN: env SYCL_UR_TRACE=1 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK-FIRST,CHECK --implicit-check-not=piProgramBuild +// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK-FIRST,CHECK --implicit-check-not=piProgramBuild // RUN: %{compile} -DRUN_MIDDLE_BEFORE -// RUN: env SYCL_UR_TRACE=1 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK-MIDDLE-BEFORE,CHECK --implicit-check-not=piProgramBuild +// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK-MIDDLE-BEFORE,CHECK --implicit-check-not=piProgramBuild // RUN: %{compile} -DRUN_MIDDLE_AFTER -// RUN: env SYCL_UR_TRACE=1 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK-MIDDLE-AFTER,CHECK --implicit-check-not=piProgramBuild +// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK-MIDDLE-AFTER,CHECK --implicit-check-not=piProgramBuild // clang-format off // This causes SEG. FAULT. // RUNx: %{compile} -DRUN_LAST -// RUNx: env SYCL_UR_TRACE=1 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK-LAST,CHECK --implicit-check-not=piProgramBuild +// RUNx: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK-LAST,CHECK --implicit-check-not=piProgramBuild // clang-format on #include diff --git a/sycl/test-e2e/SpecConstants/2020/image_selection.cpp b/sycl/test-e2e/SpecConstants/2020/image_selection.cpp index 1709185896571..9d7a28074f679 100644 --- a/sycl/test-e2e/SpecConstants/2020/image_selection.cpp +++ b/sycl/test-e2e/SpecConstants/2020/image_selection.cpp @@ -6,21 +6,21 @@ // clang-format off // RUN: %clangxx -fsycl-add-default-spec-consts-image -fsycl -fsycl-targets=spir64_gen -Xsycl-target-backend=spir64_gen %gpu_aot_target_opts %s -o %t1.out -// RUN: env SYCL_UR_TRACE=1 %{run} %t1.out | FileCheck --match-full-lines --check-prefix=CHECK-ENABLED %s +// RUN: env SYCL_UR_TRACE=2 %{run} %t1.out | FileCheck --match-full-lines --check-prefix=CHECK-ENABLED %s // clang-format on // Check the behaviour when -fsycl-add-default-spec-consts-image option is not // used. // RUN: %clangxx -fsycl -fsycl-targets=spir64_gen -Xsycl-target-backend=spir64_gen %gpu_aot_target_opts %s -o %t2.out -// RUN: env SYCL_UR_TRACE=1 %{run} %t2.out | FileCheck --match-full-lines --check-prefix=CHECK-DEFAULT %s +// RUN: env SYCL_UR_TRACE=2 %{run} %t2.out | FileCheck --match-full-lines --check-prefix=CHECK-DEFAULT %s // Check the behaviour when -fsycl-add-default-spec-consts-image option is used // and we have spirv image in addition to AOT. // clang-format off // RUN: %clangxx -fsycl -fsycl-targets=spir64,spir64_gen -Xsycl-target-backend=spir64_gen %gpu_aot_target_opts %s -o %t3.out -// RUN: env SYCL_UR_TRACE=1 %{run} %t3.out | FileCheck --match-full-lines --check-prefix=CHECK-MIX %s +// RUN: env SYCL_UR_TRACE=2 %{run} %t3.out | FileCheck --match-full-lines --check-prefix=CHECK-MIX %s // clang-format on // Check the behaviour when -fsycl-add-default-spec-consts-image option is used @@ -29,7 +29,7 @@ // clang-format off // RUN: %clangxx -fsycl-add-default-spec-consts-image -fsycl -fsycl-targets=spir64_gen -Xsycl-target-backend=spir64_gen %gpu_aot_target_opts %s -o %t3.out -// RUN: env SYCL_UR_TRACE=1 %{run} %t3.out | FileCheck --match-full-lines --check-prefix=CHECK-DEFAULT-EXPLICIT-SET %s +// RUN: env SYCL_UR_TRACE=2 %{run} %t3.out | FileCheck --match-full-lines --check-prefix=CHECK-DEFAULT-EXPLICIT-SET %s // clang-format on // Check the behaviour when -fsycl-add-default-spec-consts-image option is used @@ -39,7 +39,7 @@ // clang-format off // RUN: %clangxx -fsycl-add-default-spec-consts-image -fsycl -fsycl-targets=spir64_gen -Xsycl-target-backend=spir64_gen %gpu_aot_target_opts %s -o %t3.out -// RUN: env SYCL_UR_TRACE=1 %{run} %t3.out | FileCheck --match-full-lines --check-prefix=CHECK-DEFAULT-BACK-TO-DEFAULT %s +// RUN: env SYCL_UR_TRACE=2 %{run} %t3.out | FileCheck --match-full-lines --check-prefix=CHECK-DEFAULT-BACK-TO-DEFAULT %s // clang-format on #include diff --git a/sycl/test-e2e/SpecConstants/2020/non_native/SpecConstBuffer.cpp b/sycl/test-e2e/SpecConstants/2020/non_native/SpecConstBuffer.cpp index d8798caf04f14..675e842ce4ceb 100644 --- a/sycl/test-e2e/SpecConstants/2020/non_native/SpecConstBuffer.cpp +++ b/sycl/test-e2e/SpecConstants/2020/non_native/SpecConstBuffer.cpp @@ -2,7 +2,7 @@ // RUN: %clangxx -fsycl -fsycl-targets=spir64_x86_64 %S/Inputs/common.cpp -o %t.out \ // RUN: -fsycl-dead-args-optimization -// RUN: env SYCL_UR_TRACE=1 %{run} %t.out | FileCheck %s +// RUN: env SYCL_UR_TRACE=2 %{run} %t.out | FileCheck %s #include diff --git a/sycl/test-e2e/Tracing/buffer_printers.cpp b/sycl/test-e2e/Tracing/buffer_printers.cpp index 1266541a57cbf..1ebc926e1ca12 100644 --- a/sycl/test-e2e/Tracing/buffer_printers.cpp +++ b/sycl/test-e2e/Tracing/buffer_printers.cpp @@ -1,5 +1,5 @@ // RUN: %{build} -o %t.out -// RUN: env SYCL_UR_TRACE=1 %{run} %t.out | FileCheck %s +// RUN: env SYCL_UR_TRACE=2 %{run} %t.out | FileCheck %s // // XFAIL: hip_nvidia