From b72f1a152830fa10890878cd54881901300d39e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=C5=9Alusarczyk?= Date: Tue, 17 Sep 2024 21:59:51 +0200 Subject: [PATCH] [SYCL][E2E] fixed UR FileCheck conditions to match new traces makes llvm work with this change: https://github.com/oneapi-src/unified-runtime/pull/2101 fixes this bug: https://github.com/oneapi-src/unified-runtime/issues/2002 --- sycl/cmake/modules/FetchUnifiedRuntime.cmake | 16 +-- .../buffer/native_buffer_creation_flags.cpp | 2 +- .../Basic/buffer/subbuffer_overlap.cpp | 4 +- sycl/test-e2e/Basic/event_release.cpp | 4 +- sycl/test-e2e/Basic/fill_accessor_ur.cpp | 14 +- .../Basic/kernel_bundle/kernel_bundle_api.cpp | 30 ++--- sycl/test-e2e/DeviceCodeSplit/grf.cpp | 8 +- .../DiscardEvents/discard_events_usm.cpp | 2 +- .../test-e2e/ESIMD/esimd_check_vc_codegen.cpp | 2 +- .../test-e2e/Graph/Explicit/kernel_bundle.cpp | 14 +- sycl/test-e2e/Graph/Explicit/memadvise.cpp | 4 +- sycl/test-e2e/Graph/Explicit/prefetch.cpp | 4 +- .../test-e2e/Graph/RecordReplay/memadvise.cpp | 4 +- sycl/test-e2e/Graph/RecordReplay/prefetch.cpp | 4 +- .../KernelAndProgram/cache_env_vars.cpp | 12 +- .../KernelAndProgram/cache_env_vars_lin.cpp | 12 +- .../KernelAndProgram/cache_env_vars_win.cpp | 12 +- .../KernelAndProgram/disable-caching.cpp | 120 +++++++++--------- .../kernel-bundle-merge-options-env.cpp | 6 +- .../kernel-bundle-merge-options.cpp | 6 +- .../KernelAndProgram/target_compile_fast.cpp | 4 +- .../Plugin/level_zero_batch_event_status.cpp | 2 +- .../level_zero_usm_device_read_only.cpp | 2 +- .../sycl-opt-level-level-zero.cpp | 4 +- .../sycl-opt-level-opencl.cpp | 8 +- sycl/test-e2e/Regression/pi_release.cpp | 4 +- sycl/test-e2e/Scheduler/InOrderQueueDeps.cpp | 6 +- sycl/test-e2e/Scheduler/MemObjRemapping.cpp | 8 +- .../test-e2e/Scheduler/SubBufferRemapping.cpp | 6 +- .../SharedLib/use_when_link_verify_cache.cpp | 6 +- .../use_with_dlopen_verify_cache.cpp | 10 +- .../SpecConstants/2020/image_selection.cpp | 24 ++-- .../2020/non_native/SpecConstBuffer.cpp | 2 +- 33 files changed, 183 insertions(+), 183 deletions(-) diff --git a/sycl/cmake/modules/FetchUnifiedRuntime.cmake b/sycl/cmake/modules/FetchUnifiedRuntime.cmake index 1c245a91ca59d..f77c1673d3317 100644 --- a/sycl/cmake/modules/FetchUnifiedRuntime.cmake +++ b/sycl/cmake/modules/FetchUnifiedRuntime.cmake @@ -116,14 +116,14 @@ if(SYCL_UR_USE_FETCH_CONTENT) CACHE PATH "Path to external '${name}' adapter source dir" FORCE) endfunction() - set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git") - # commit 897bcfb10a7e13b8e413278550e845322f6bd560 (HEAD, origin/main, origin/HEAD) - # Merge: 18514924 71cdf253 - # Author: Omar Ahmed - # Date: Thu Sep 19 14:35:55 2024 +0100 - # Merge pull request #2022 from nrspruit/add_3_channel_image_support - # [L0] Add 3-channel image support - set(UNIFIED_RUNTIME_TAG 897bcfb10a7e13b8e413278550e845322f6bd560) + set(UNIFIED_RUNTIME_REPO "https://github.com/lslusarczyk/unified-runtime.git") + # commit 185149248dd257bd37482aac43307a136204c051 + # Merge: 2af159d4 d619bcd1 + # Author: Piotr Balcer + # Date: Thu Sep 19 11:02:27 2024 +0200 + # Merge pull request #1934 from yingcong-wu/yc/0806-exclude-shadow-from-coredump + # [DeviceSanitizer] Exclude shadow memory from coredump file for CPU device. + set(UNIFIED_RUNTIME_TAG 2b5d716653915ebab91e1f92e3ff02cca5f1a572) 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/test-e2e/Basic/buffer/native_buffer_creation_flags.cpp b/sycl/test-e2e/Basic/buffer/native_buffer_creation_flags.cpp index c7fae978d3fa7..77a2fcf34796d 100644 --- a/sycl/test-e2e/Basic/buffer/native_buffer_creation_flags.cpp +++ b/sycl/test-e2e/Basic/buffer/native_buffer_creation_flags.cpp @@ -20,7 +20,7 @@ int main() { Q.submit([&](handler &Cgh) { // Now that we have a read-write host allocation, check that the native // buffer is created with the UR_MEM_FLAG_USE_HOST_POINTER flag. - // CHECK: urMemBufferCreate + // CHECK: ---> urMemBufferCreate // CHECK-SAME: UR_MEM_FLAG_USE_HOST_POINTER auto BufAcc = Buf.get_access(Cgh); Cgh.single_task([=]() { int A = BufAcc[0]; }); diff --git a/sycl/test-e2e/Basic/buffer/subbuffer_overlap.cpp b/sycl/test-e2e/Basic/buffer/subbuffer_overlap.cpp index 91cf5360549e7..35a6c2c699a1a 100644 --- a/sycl/test-e2e/Basic/buffer/subbuffer_overlap.cpp +++ b/sycl/test-e2e/Basic/buffer/subbuffer_overlap.cpp @@ -16,13 +16,13 @@ int main() { for (auto &e : sycl::host_accessor{b}) e = idx++ % size; - // CHECK: urMemBufferPartition + // CHECK: ---> urMemBufferPartition // CHECK: .origin = 256, .size = 64 q.submit([&](sycl::handler &cgh) { sycl::accessor acc{sub1, cgh}; cgh.parallel_for(size, [=](auto id) { acc[id] += 1; }); }); - // CHECK: urMemBufferPartition + // CHECK: ---> urMemBufferPartition // CHECK: .origin = 256, .size = 128 q.submit([&](sycl::handler &cgh) { sycl::accessor acc{sub2, cgh}; diff --git a/sycl/test-e2e/Basic/event_release.cpp b/sycl/test-e2e/Basic/event_release.cpp index 0ecccfa4dcecc..d40c8494e1c79 100644 --- a/sycl/test-e2e/Basic/event_release.cpp +++ b/sycl/test-e2e/Basic/event_release.cpp @@ -29,8 +29,8 @@ int main() { // Buffer destruction triggers execution graph cleanup, check that both // events (one for launching the kernel and one for memory transfer to host) // are released. - // CHECK: urEventRelease - // CHECK: urEventRelease + // CHECK: ---> urEventRelease + // CHECK: ---> urEventRelease assert(Val == Gold); // CHECK: End of main scope std::cout << "End of main scope" << std::endl; diff --git a/sycl/test-e2e/Basic/fill_accessor_ur.cpp b/sycl/test-e2e/Basic/fill_accessor_ur.cpp index c93f327be1199..d1eca95453402 100644 --- a/sycl/test-e2e/Basic/fill_accessor_ur.cpp +++ b/sycl/test-e2e/Basic/fill_accessor_ur.cpp @@ -129,19 +129,19 @@ int main() { } // CHECK: start testFill_Buffer1D -// CHECK: urEnqueueMemBufferFill +// CHECK: ---> urEnqueueMemBufferFill // CHECK: start testFill_Buffer1D -- OFFSET -// CHECK: urEnqueueMemBufferFill +// CHECK: ---> urEnqueueMemBufferFill // CHECK: start testFill_Buffer2D -// CHECK: urEnqueueMemBufferFill +// CHECK: ---> urEnqueueMemBufferFill // CHECK: start testFill_Buffer2D -- OFFSET -// CHECK: urEnqueueKernelLaunch +// CHECK: ---> urEnqueueKernelLaunch // CHECK: start testFill_Buffer3D -// CHECK: urEnqueueMemBufferFill +// CHECK: ---> urEnqueueMemBufferFill // CHECK: start testFill_Buffer3D -- OFFSET -// CHECK: urEnqueueKernelLaunch +// CHECK: ---> urEnqueueKernelLaunch // CHECK: start testFill_ZeroDim -// CHECK: urEnqueueMemBufferFill +// CHECK: ---> urEnqueueMemBufferFill 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 32d2706eb15b0..fce45b8414a00 100644 --- a/sycl/test-e2e/Basic/kernel_bundle/kernel_bundle_api.cpp +++ b/sycl/test-e2e/Basic/kernel_bundle/kernel_bundle_api.cpp @@ -150,26 +150,26 @@ int main() { sycl::kernel_bundle KernelBundleObject1 = sycl::compile(KernelBundleInput1, KernelBundleInput1.get_devices()); - // CHECK:---> urProgramCreate + // CHECK:<--- urProgramCreate // CHECK-SAME:, .phProgram = {{.*}} ([[PROGRAM_HANDLE1:[0-9a-fA-Fx]+]]) // CHECK-SAME: -> UR_RESULT_SUCCESS; // - // CHECK:---> urProgramCompile + // CHECK:<--- urProgramCompile // CHECK-SAME: .hProgram = [[PROGRAM_HANDLE1]] sycl::kernel_bundle KernelBundleObject2 = sycl::compile(KernelBundleInput2, KernelBundleInput2.get_devices()); - // CHECK:---> urProgramCreate + // CHECK:<--- urProgramCreate // CHECK-SAME:, .phProgram = {{.*}} ([[PROGRAM_HANDLE2:[0-9a-fA-Fx]+]]) // CHECK-SAME: -> UR_RESULT_SUCCESS; // - // CHECK:---> urProgramCompile( + // CHECK:<--- urProgramCompile( // CHECK-SAME: .hProgram = [[PROGRAM_HANDLE2]] sycl::kernel_bundle KernelBundleExecutable = sycl::link({KernelBundleObject1, KernelBundleObject2}, KernelBundleObject1.get_devices()); - // CHECK:---> urProgramLink{{.*}} -> UR_RESULT_SUCCESS; + // CHECK:<--- urProgramLink{{.*}} -> UR_RESULT_SUCCESS; // UR tracing doesn't allow checking for all input programs so far. assert(KernelBundleExecutable.has_kernel(Kernel1ID)); @@ -179,14 +179,14 @@ int main() { KernelBundleExecutable2 = sycl::build(KernelBundleInput1, KernelBundleInput1.get_devices()); - // CHECK:---> urProgramCreate + // CHECK:<--- urProgramCreate // CHECK-SAME:, .phProgram = {{.*}} ([[PROGRAM_HANDLE3:[0-9a-fA-Fx]+]]) // CHECK-SAME: -> UR_RESULT_SUCCESS; // - // CHECK:---> urProgramBuild( + // CHECK:<--- urProgramBuild( // CHECK-SAME: .hProgram = [[PROGRAM_HANDLE3]] // - // CHECK:---> urProgramRetain( + // CHECK:<--- urProgramRetain( // CHECK-SAME: .hProgram = [[PROGRAM_HANDLE3]] // CHECK-SAME:-> UR_RESULT_SUCCESS; @@ -204,31 +204,31 @@ int main() { sycl::kernel_bundle KernelBundleExecutable = sycl::get_kernel_bundle(Ctx, {Dev}, {Kernel3ID}); - // CHECK:---> urProgramCreate + // CHECK:<--- urProgramCreate // CHECK-SAME:, .phProgram = {{.*}} ([[PROGRAM_HANDLE4:[0-9a-fA-Fx]+]]) // CHECK-SAME: -> UR_RESULT_SUCCESS; // - // CHECK:---> urProgramBuild( + // CHECK:<--- urProgramBuild( // CHECK-SAME: .hProgram = [[PROGRAM_HANDLE4]] // - // CHECK:---> urProgramRetain( + // CHECK:<--- urProgramRetain( // CHECK-SAME: .hProgram = [[PROGRAM_HANDLE4]] // CHECK-SAME:-> UR_RESULT_SUCCESS; // - // CHECK:---> urKernelCreate( + // CHECK:<--- urKernelCreate( // CHECK-SAME: .hProgram = [[PROGRAM_HANDLE4]] // CHECK-SAME: .pKernelName = {{[0-9a-fA-Fx]+}} (_ZTS11Kernel3Name) // CHECK-SAME: .phKernel = {{[0-9a-fA-Fx]+}} ([[KERNEL_HANDLE:[0-9a-fA-Fx]+]]) // CHECK-SAME: -> UR_RESULT_SUCCESS; // - // CHECK:---> urKernelRetain( + // CHECK:<--- urKernelRetain( // CHECK-SAME: .hKernel = [[KERNEL_HANDLE]] // CHECK-SAME:-> UR_RESULT_SUCCESS; // - // CHECK:---> urEnqueueKernelLaunch( + // CHECK:<--- urEnqueueKernelLaunch( // CHECK-SAME: .hKernel = [[KERNEL_HANDLE]] // - // CHECK:---> urKernelRelease( + // CHECK:<--- urKernelRelease( // CHECK-SAME: .hKernel = [[KERNEL_HANDLE]] // CHECK-SAME:-> UR_RESULT_SUCCESS; diff --git a/sycl/test-e2e/DeviceCodeSplit/grf.cpp b/sycl/test-e2e/DeviceCodeSplit/grf.cpp index 167c744bc90fc..249e177c7a224 100644 --- a/sycl/test-e2e/DeviceCodeSplit/grf.cpp +++ b/sycl/test-e2e/DeviceCodeSplit/grf.cpp @@ -145,10 +145,10 @@ int main(void) { // CHECK: ---> urKernelCreate({{.*}}SingleGRF{{.*}}-> UR_RESULT_SUCCESS -// CHECK-NO-VAR: urProgramBuild{{.*}}-ze-opt-large-register-file -// CHECK-WITH-VAR: urProgramBuild{{.*}}-g -ze-opt-large-register-file -// CHECK-AUTO-NO-VAR: urProgramBuild{{.*}}-ze-intel-enable-auto-large-GRF-mode -// CHECK-AUTO-WITH-VAR: urProgramBuild{{.*}}-g -ze-intel-enable-auto-large-GRF-mode +// CHECK-NO-VAR: ---> urProgramBuild{{.*}}-ze-opt-large-register-file +// CHECK-WITH-VAR: ---> urProgramBuild{{.*}}-g -ze-opt-large-register-file +// CHECK-AUTO-NO-VAR: ---> urProgramBuild{{.*}}-ze-intel-enable-auto-large-GRF-mode +// CHECK-AUTO-WITH-VAR: ---> urProgramBuild{{.*}}-g -ze-intel-enable-auto-large-GRF-mode // CHECK-SAME: -> UR_RESULT_SUCCESS // CHECK: ---> urKernelCreate({{.*}}SpecifiedGRF{{.*}}-> UR_RESULT_SUCCESS diff --git a/sycl/test-e2e/DiscardEvents/discard_events_usm.cpp b/sycl/test-e2e/DiscardEvents/discard_events_usm.cpp index e6416f211c9e5..d661679a013f7 100644 --- a/sycl/test-e2e/DiscardEvents/discard_events_usm.cpp +++ b/sycl/test-e2e/DiscardEvents/discard_events_usm.cpp @@ -71,7 +71,7 @@ // CHECK: ---> urEnqueueUSMPrefetch // CHECK: .phEvent = nullptr // -// CHECK: ---> urEnqueueUSMAdvise +// CHECK: <--- urEnqueueUSMAdvise // CHECK: .phEvent = nullptr // CHECK-SAME: ) -> {{UR_RESULT_SUCCESS|UR_RESULT_ERROR_ADAPTER_SPECIFIC}} // diff --git a/sycl/test-e2e/ESIMD/esimd_check_vc_codegen.cpp b/sycl/test-e2e/ESIMD/esimd_check_vc_codegen.cpp index 09281973850c2..9576916b0e8bc 100644 --- a/sycl/test-e2e/ESIMD/esimd_check_vc_codegen.cpp +++ b/sycl/test-e2e/ESIMD/esimd_check_vc_codegen.cpp @@ -94,4 +94,4 @@ int main(void) { // Don't use -NEXT here to split the line because we need to allow for the // possbility of a BuildExp( that fails with UNSUPPORTED followed by a Build( // that results in SUCCESS -// CHECK: ---> urProgramBuild{{(Exp)?}}({{.*}}-vc-codegen{{.*}} -> UR_RESULT_SUCCESS +// CHECK: <--- urProgramBuild{{(Exp)?}}({{.*}}-vc-codegen{{.*}} -> UR_RESULT_SUCCESS diff --git a/sycl/test-e2e/Graph/Explicit/kernel_bundle.cpp b/sycl/test-e2e/Graph/Explicit/kernel_bundle.cpp index a43f7bb47d37f..174a4e5d2dce5 100644 --- a/sycl/test-e2e/Graph/Explicit/kernel_bundle.cpp +++ b/sycl/test-e2e/Graph/Explicit/kernel_bundle.cpp @@ -5,27 +5,27 @@ // Checks the UR call trace to ensure that the bundle kernel of the single task // is used. -// CHECK:---> urProgramCreateWithIL( +// CHECK:<--- urProgramCreateWithIL( // CHECK-SAME: .phProgram = {{.*}} ([[PROGRAM_HANDLE1:[0-9a-fA-Fx]+]]) // -// CHECK:---> urProgramBuildExp( +// CHECK:<--- urProgramBuildExp( // CHECK-SAME: .hProgram = [[PROGRAM_HANDLE1]] // -// CHECK:---> urProgramRetain(.hProgram = [[PROGRAM_HANDLE1]]) -> UR_RESULT_SUCCESS +// CHECK:<--- urProgramRetain(.hProgram = [[PROGRAM_HANDLE1]]) -> UR_RESULT_SUCCESS -// CHECK:---> urKernelCreate( +// CHECK:<--- urKernelCreate( // CHECK-SAME: .hProgram = [[PROGRAM_HANDLE1]] // CHECK-SAME: .pKernelName = {{.*}} (_ZTS11Kernel1Name) // CHECK-SAME: .phKernel = {{.*}} ([[KERNEL_HANDLE:[0-9a-fA-Fx]+]]) // CHECK-SAME: -> UR_RESULT_SUCCESS // -// CHECK:---> urKernelRetain(.hKernel = [[KERNEL_HANDLE]]) -> UR_RESULT_SUCCESS +// CHECK:<--- urKernelRetain(.hKernel = [[KERNEL_HANDLE]]) -> UR_RESULT_SUCCESS // -// CHECK:---> urCommandBufferAppendKernelLaunchExp( +// CHECK:<--- urCommandBufferAppendKernelLaunchExp( // CHECK-SAME: .hKernel = [[KERNEL_HANDLE]] // -// CHECK:---> urKernelRelease(.hKernel = [[KERNEL_HANDLE]]) -> UR_RESULT_SUCCESS +// CHECK:<--- urKernelRelease(.hKernel = [[KERNEL_HANDLE]]) -> UR_RESULT_SUCCESS #define GRAPH_E2E_EXPLICIT diff --git a/sycl/test-e2e/Graph/Explicit/memadvise.cpp b/sycl/test-e2e/Graph/Explicit/memadvise.cpp index 080951e2663c5..e0355aabcc7e9 100644 --- a/sycl/test-e2e/Graph/Explicit/memadvise.cpp +++ b/sycl/test-e2e/Graph/Explicit/memadvise.cpp @@ -10,14 +10,14 @@ // impact results but only performances, we verify // that a node is correctly added by checking UR function calls. -// CHECK: urCommandBufferAppendUSMAdviseExp +// CHECK: ---> urCommandBufferAppendUSMAdviseExp // CHECK-SAME: .hCommandBuffer = 0x[[#%x,COMMAND_BUFFER:]] // CHECK-SAME: .pMemory = 0x[[#%x,PTR:]] // CHECK-SAME: .size = 400 // CHECK-SAME: .pSyncPoint = {{.*}} (0x[[#%x,ADVISE_SYNC_POINT:]]) // CHECK-SAME: -> UR_RESULT_SUCCESS -// CHECK: urCommandBufferAppendKernelLaunchExp( +// CHECK: ---> urCommandBufferAppendKernelLaunchExp( // CHECK-SAME: .hCommandBuffer = 0x[[#%x,COMMAND_BUFFER]] // CHECK-SAME: .hKernel = 0x[[#%x,KERNEL:]] // CHECK-SAME: .workDim = 1 diff --git a/sycl/test-e2e/Graph/Explicit/prefetch.cpp b/sycl/test-e2e/Graph/Explicit/prefetch.cpp index a51d98b837075..e2adfac4d0b7b 100644 --- a/sycl/test-e2e/Graph/Explicit/prefetch.cpp +++ b/sycl/test-e2e/Graph/Explicit/prefetch.cpp @@ -10,13 +10,13 @@ // impact results but only performances, we verify // that a node is correctly added by checking UR function calls -// CHECK: urCommandBufferAppendUSMPrefetchExp( +// CHECK: ---> urCommandBufferAppendUSMPrefetchExp( // CHECK-SAME: .hCommandBuffer = 0x[[#%x,COMMAND_BUFFER:]] // CHECK-SAME: .pMemory = 0x[[#%x,PTR:]] // CHECK-SAME: .size = 400 // CHECK-SAME: .pSyncPoint = {{.*}} (0x[[#%x,PREFETCH_SYNC_POINT:]]) -// CHECK: urCommandBufferAppendKernelLaunchExp( +// CHECK: ---> urCommandBufferAppendKernelLaunchExp( // CHECK-SAME: .hCommandBuffer = 0x[[#%x,COMMAND_BUFFER]] // CHECK-SAME: .hKernel = 0x[[#%x,KERNEL:]] // CHECK-SAME: .workDim = 1 diff --git a/sycl/test-e2e/Graph/RecordReplay/memadvise.cpp b/sycl/test-e2e/Graph/RecordReplay/memadvise.cpp index b1ba7b2eea9c6..8c1398a250c88 100644 --- a/sycl/test-e2e/Graph/RecordReplay/memadvise.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/memadvise.cpp @@ -10,13 +10,13 @@ // impact results but only performances, we verify // that a node is correctly added by checking UR function calls. -// CHECK: urCommandBufferAppendUSMAdviseExp +// CHECK: ---> urCommandBufferAppendUSMAdviseExp // CHECK-SAME: .hCommandBuffer = 0x[[#%x,COMMAND_BUFFER:]] // CHECK-SAME: .pMemory = 0x[[#%x,PTR:]] // CHECK-SAME: .size = 400 // CHECK-SAME: .pSyncPoint = {{.*}} (0x[[#%x,ADVISE_SYNC_POINT:]]) -// CHECK: urCommandBufferAppendKernelLaunchExp( +// CHECK: ---> urCommandBufferAppendKernelLaunchExp( // CHECK-SAME: .hCommandBuffer = 0x[[#%x,COMMAND_BUFFER]] // CHECK-SAME: .hKernel = 0x[[#%x,KERNEL:]] // CHECK-SAME: .workDim = 1 diff --git a/sycl/test-e2e/Graph/RecordReplay/prefetch.cpp b/sycl/test-e2e/Graph/RecordReplay/prefetch.cpp index 23f16d4d49127..18c85d097f1bd 100644 --- a/sycl/test-e2e/Graph/RecordReplay/prefetch.cpp +++ b/sycl/test-e2e/Graph/RecordReplay/prefetch.cpp @@ -10,13 +10,13 @@ // impact results but only performances, we verify // that a node is correctly added by checking UR function calls -// CHECK: urCommandBufferAppendUSMPrefetchExp( +// CHECK: ---> urCommandBufferAppendUSMPrefetchExp( // CHECK-SAME: .hCommandBuffer = 0x[[#%x,COMMAND_BUFFER:]] // CHECK-SAME: .pMemory = 0x[[#%x,PTR:]] // CHECK-SAME: .size = 400 // CHECK-SAME: .pSyncPoint = {{.*}} (0x[[#%x,PREFETCH_SYNC_POINT:]]) -// CHECK: urCommandBufferAppendKernelLaunchExp( +// CHECK: ---> urCommandBufferAppendKernelLaunchExp( // CHECK-SAME: .hCommandBuffer = 0x[[#%x,COMMAND_BUFFER]] // CHECK-SAME: .hKernel = 0x[[#%x,KERNEL:]] // CHECK-SAME: .workDim = 1 diff --git a/sycl/test-e2e/KernelAndProgram/cache_env_vars.cpp b/sycl/test-e2e/KernelAndProgram/cache_env_vars.cpp index 852ec3ed9df54..dd5da059bec75 100644 --- a/sycl/test-e2e/KernelAndProgram/cache_env_vars.cpp +++ b/sycl/test-e2e/KernelAndProgram/cache_env_vars.cpp @@ -25,12 +25,12 @@ // Some backends will call urProgramBuild and some will call // urProgramBuildExp depending on urProgramBuildExp support. -// CHECK-BUILD-NOT: urProgramCreateWithBinary( -// CHECK-BUILD: urProgramCreateWithIL( -// CHECK-BUILD: urProgramBuild{{(Exp)?}}( +// CHECK-BUILD-NOT: ---> urProgramCreateWithBinary( +// CHECK-BUILD: ---> urProgramCreateWithIL( +// CHECK-BUILD: ---> urProgramBuild{{(Exp)?}}( -// CHECK-CACHE-NOT: urProgramCreateWithIL( -// CHECK-CACHE: urProgramCreateWithBinary( -// CHECK-CACHE: urProgramBuild{{(Exp)?}}( +// CHECK-CACHE-NOT: ---> urProgramCreateWithIL( +// CHECK-CACHE: ---> urProgramCreateWithBinary( +// CHECK-CACHE: ---> urProgramBuild{{(Exp)?}}( #include "cache_env_vars.hpp" diff --git a/sycl/test-e2e/KernelAndProgram/cache_env_vars_lin.cpp b/sycl/test-e2e/KernelAndProgram/cache_env_vars_lin.cpp index e43ed543ba5d2..cc6a1f55a9120 100644 --- a/sycl/test-e2e/KernelAndProgram/cache_env_vars_lin.cpp +++ b/sycl/test-e2e/KernelAndProgram/cache_env_vars_lin.cpp @@ -24,12 +24,12 @@ // Some backends will call urProgramBuild and some will call urProgramBuildExp depending on urProgramBuildExp support. -// CHECK-BUILD-NOT: urProgramCreateWithBinary( -// CHECK-BUILD: urProgramCreateWithIL( -// CHECK-BUILD: urProgramBuild{{(Exp)?}}( +// CHECK-BUILD-NOT: ---> urProgramCreateWithBinary( +// CHECK-BUILD: ---> urProgramCreateWithIL( +// CHECK-BUILD: ---> urProgramBuild{{(Exp)?}}( -// CHECK-CACHE-NOT: urProgramCreateWithIL( -// CHECK-CACHE: urProgramCreateWithBinary( -// CHECK-CACHE: urProgramBuild{{(Exp)?}}( +// CHECK-CACHE-NOT: ---> urProgramCreateWithIL( +// CHECK-CACHE: ---> urProgramCreateWithBinary( +// CHECK-CACHE: ---> urProgramBuild{{(Exp)?}}( #include "cache_env_vars.hpp" diff --git a/sycl/test-e2e/KernelAndProgram/cache_env_vars_win.cpp b/sycl/test-e2e/KernelAndProgram/cache_env_vars_win.cpp index 064db1e734014..9bed16d74a304 100644 --- a/sycl/test-e2e/KernelAndProgram/cache_env_vars_win.cpp +++ b/sycl/test-e2e/KernelAndProgram/cache_env_vars_win.cpp @@ -19,12 +19,12 @@ // 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( -// CHECK-BUILD: urProgramBuild{{(Exp)?}}( +// CHECK-BUILD-NOT: ---> urProgramCreateWithBinary( +// CHECK-BUILD: ---> urProgramCreateWithIL( +// CHECK-BUILD: ---> urProgramBuild{{(Exp)?}}( -// CHECK-CACHE-NOT: urProgramCreateWithIL( -// CHECK-CACHE: urProgramCreateWithBinary( -// CHECK-CACHE: urProgramBuild{{(Exp)?}}( +// CHECK-CACHE-NOT: ---> urProgramCreateWithIL( +// CHECK-CACHE: ---> urProgramCreateWithBinary( +// CHECK-CACHE: ---> urProgramBuild{{(Exp)?}}( #include "cache_env_vars.hpp" diff --git a/sycl/test-e2e/KernelAndProgram/disable-caching.cpp b/sycl/test-e2e/KernelAndProgram/disable-caching.cpp index 5e8ef4045d641..f0a19fa21af1f 100644 --- a/sycl/test-e2e/KernelAndProgram/disable-caching.cpp +++ b/sycl/test-e2e/KernelAndProgram/disable-caching.cpp @@ -21,66 +21,66 @@ constexpr specialization_id spec_id; int main() { queue q; - // CHECK: urProgramCreate - // CHECK-NOT: urProgramRetain - // CHECK: urKernelCreate - // CHECK-NOT: urKernelRetain - // CHECK: urEnqueueKernelLaunch - // CHECK: urKernelRelease - // CHECK: urProgramRelease - // CHECK: urEventWait + // CHECK: ---> urProgramCreate + // CHECK-NOT: ---> urProgramRetain + // CHECK: ---> urKernelCreate + // CHECK-NOT: ---> urKernelRetain + // CHECK: ---> urEnqueueKernelLaunch + // CHECK: ---> urKernelRelease + // CHECK: ---> urProgramRelease + // CHECK: ---> urEventWait - // CHECK-CACHE: urProgramCreate - // CHECK-CACHE: urProgramRetain - // CHECK-CACHE-NOT: urProgramRetain - // CHECK-CACHE: urKernelCreate - // CHECK-CACHE: urKernelRetain - // CHECK-CACHE-NOT: urKernelCreate - // CHECK-CACHE: urEnqueueKernelLaunch - // CHECK-CACHE: urKernelRelease - // CHECK-CACHE: urProgramRelease - // CHECK-CACHE: urEventWait + // CHECK-CACHE: ---> urProgramCreate + // CHECK-CACHE: ---> urProgramRetain + // CHECK-CACHE-NOT: ---> urProgramRetain + // CHECK-CACHE: ---> urKernelCreate + // CHECK-CACHE: ---> urKernelRetain + // CHECK-CACHE-NOT: ---> urKernelCreate + // CHECK-CACHE: ---> urEnqueueKernelLaunch + // CHECK-CACHE: ---> urKernelRelease + // CHECK-CACHE: ---> urProgramRelease + // CHECK-CACHE: ---> urEventWait q.single_task([] {}).wait(); - // CHECK: urProgramCreate - // CHECK-NOT: urProgramRetain - // CHECK: urKernelCreate - // CHECK-NOT: urKernelRetain - // CHECK: urEnqueueKernelLaunch - // CHECK: urKernelRelease - // CHECK: urProgramRelease - // CHECK: urEventWait + // CHECK: ---> urProgramCreate + // CHECK-NOT: ---> urProgramRetain + // CHECK: ---> urKernelCreate + // CHECK-NOT: ---> urKernelRetain + // CHECK: ---> urEnqueueKernelLaunch + // CHECK: ---> urKernelRelease + // CHECK: ---> urProgramRelease + // CHECK: ---> urEventWait - // CHECK-CACHE: urProgramCreate - // CHECK-CACHE: urProgramRetain - // CHECK-CACHE-NOT: urProgramRetain - // CHECK-CACHE: urKernelCreate - // CHECK-CACHE: urKernelRetain - // CHECK-CACHE-NOT: urKernelCreate - // CHECK-CACHE: urEnqueueKernelLaunch - // CHECK-CACHE: urKernelRelease - // CHECK-CACHE: urProgramRelease - // CHECK-CACHE: urEventWait + // CHECK-CACHE: ---> urProgramCreate + // CHECK-CACHE: ---> urProgramRetain + // CHECK-CACHE-NOT: ---> urProgramRetain + // CHECK-CACHE: ---> urKernelCreate + // CHECK-CACHE: ---> urKernelRetain + // CHECK-CACHE-NOT: ---> urKernelCreate + // CHECK-CACHE: ---> urEnqueueKernelLaunch + // CHECK-CACHE: ---> urKernelRelease + // CHECK-CACHE: ---> urProgramRelease + // CHECK-CACHE: ---> urEventWait - // CHECK: urProgramCreate - // CHECK-NOT: urProgramRetain - // CHECK: urKernelCreate - // CHECK-NOT: urKernelRetain - // CHECK: urEnqueueKernelLaunch - // CHECK: urKernelRelease - // CHECK: urProgramRelease - // CHECK: urEventWait + // CHECK: ---> urProgramCreate + // CHECK-NOT: ---> urProgramRetain + // CHECK: ---> urKernelCreate + // CHECK-NOT: ---> urKernelRetain + // CHECK: ---> urEnqueueKernelLaunch + // CHECK: ---> urKernelRelease + // CHECK: ---> urProgramRelease + // CHECK: ---> urEventWait - // CHECK-CACHE: urProgramCreate - // CHECK-CACHE: urProgramRetain - // CHECK-CACHE-NOT: urProgramRetain - // CHECK-CACHE: urKernelCreate - // CHECK-CACHE: urKernelRetain - // CHECK-CACHE-NOT: urKernelCreate - // CHECK-CACHE: urEnqueueKernelLaunch - // CHECK-CACHE: urKernelRelease - // CHECK-CACHE: urProgramRelease - // CHECK-CACHE: urEventWait + // CHECK-CACHE: ---> urProgramCreate + // CHECK-CACHE: ---> urProgramRetain + // CHECK-CACHE-NOT: ---> urProgramRetain + // CHECK-CACHE: ---> urKernelCreate + // CHECK-CACHE: ---> urKernelRetain + // CHECK-CACHE-NOT: ---> urKernelCreate + // CHECK-CACHE: ---> urEnqueueKernelLaunch + // CHECK-CACHE: ---> urKernelRelease + // CHECK-CACHE: ---> urProgramRelease + // CHECK-CACHE: ---> urEventWait auto *p = malloc_device(1, q); for (int i = 0; i < 2; ++i) q.submit([&](handler &cgh) { @@ -94,9 +94,9 @@ int main() { } // (Program cache releases) -// CHECK-CACHE: urKernelRelease -// CHECK-CACHE: urKernelRelease -// CHECK-CACHE: urKernelRelease -// CHECK-CACHE: urProgramRelease -// CHECK-CACHE: urProgramRelease -// CHECK-CACHE: urProgramRelease +// CHECK-CACHE: ---> urKernelRelease +// CHECK-CACHE: ---> urKernelRelease +// CHECK-CACHE: ---> urKernelRelease +// CHECK-CACHE: ---> urProgramRelease +// CHECK-CACHE: ---> urProgramRelease +// CHECK-CACHE: ---> urProgramRelease 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 698b241d98c90..50e0f2dade3b6 100644 --- a/sycl/test-e2e/KernelAndProgram/kernel-bundle-merge-options-env.cpp +++ b/sycl/test-e2e/KernelAndProgram/kernel-bundle-merge-options-env.cpp @@ -9,8 +9,8 @@ #include "kernel-bundle-merge-options.hpp" -// CHECK: urProgramBuild{{.*}}{{[^bar]*}}-DENV_COMPILE_OPTS -DENV_APPEND_COMPILE_OPTS{{[^bar]*}}-DENV_LINK_OPTS -DENV_APPEND_LINK_OPTS{{[^bar]*}} +// CHECK: ---> urProgramBuild{{.*}}{{[^bar]*}}-DENV_COMPILE_OPTS -DENV_APPEND_COMPILE_OPTS{{[^bar]*}}-DENV_LINK_OPTS -DENV_APPEND_LINK_OPTS{{[^bar]*}} -// CHECK: urProgramCompile{{.*}}{{[^bar]*}}-DENV_COMPILE_OPTS -DENV_APPEND_COMPILE_OPTS{{[^bar]*}} +// CHECK: ---> urProgramCompile{{.*}}{{[^bar]*}}-DENV_COMPILE_OPTS -DENV_APPEND_COMPILE_OPTS{{[^bar]*}} -// CHECK: urProgramLink{{.*}}{{[^bar]*}}-DENV_LINK_OPTS -DENV_APPEND_LINK_OPTS{{[^bar]*}} +// CHECK: ---> urProgramLink{{.*}}{{[^bar]*}}-DENV_LINK_OPTS -DENV_APPEND_LINK_OPTS{{[^bar]*}} diff --git a/sycl/test-e2e/KernelAndProgram/kernel-bundle-merge-options.cpp b/sycl/test-e2e/KernelAndProgram/kernel-bundle-merge-options.cpp index 2405014814339..895b96fffe9fa 100644 --- a/sycl/test-e2e/KernelAndProgram/kernel-bundle-merge-options.cpp +++ b/sycl/test-e2e/KernelAndProgram/kernel-bundle-merge-options.cpp @@ -9,12 +9,12 @@ #include "kernel-bundle-merge-options.hpp" -// CHECK: urProgramBuild +// CHECK: ---> urProgramBuild // CHECK-SAME: -g // TODO: Uncomment when build options are properly passed to compile and link // commands for kernel_bundle -// xCHECK: urProgramCompile( +// xCHECK: ---> urProgramCompile( // xCHECK-SAME: -g -// xCHECK: urProgramLink( +// xCHECK: ---> urProgramLink( // xCHECK-SAME: -g diff --git a/sycl/test-e2e/KernelAndProgram/target_compile_fast.cpp b/sycl/test-e2e/KernelAndProgram/target_compile_fast.cpp index 40dfb6ed26d2e..c352bdf368e8e 100644 --- a/sycl/test-e2e/KernelAndProgram/target_compile_fast.cpp +++ b/sycl/test-e2e/KernelAndProgram/target_compile_fast.cpp @@ -7,8 +7,8 @@ // CHECK-INTEL-GPU-WITH: ---> urProgramBuild // CHECK-INTEL-GPU-WITH-SAME: -igc_opts 'PartitionUnit=1,SubroutineThreshold=50000' -// CHECK-WITHOUT-NOT: ---> urProgramBuild{{.*}}-igc_opts{{.*}} -> UR_RESULT_SUCCESS -// CHECK-WITHOUT: ---> urProgramBuild{{.*}} -> UR_RESULT_SUCCESS +// CHECK-WITHOUT-NOT: <--- urProgramBuild{{.*}}-igc_opts{{.*}} -> UR_RESULT_SUCCESS +// CHECK-WITHOUT: <--- urProgramBuild{{.*}} -> UR_RESULT_SUCCESS #include 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 4f4ad87022dbf..57ba0134c88e1 100644 --- a/sycl/test-e2e/Plugin/level_zero_batch_event_status.cpp +++ b/sycl/test-e2e/Plugin/level_zero_batch_event_status.cpp @@ -26,7 +26,7 @@ // CHECK: ZE ---> zeCommandListClose // CHECK: ZE ---> zeCommandQueueExecuteCommandLists // CHECK: ---> urEventGetInfo -// CHECK-NOT: urEventsWait +// CHECK-NOT: ---> urEventsWait // CHECK: ---> urEnqueueKernelLaunch // CHECK: ZE ---> zeCommandListAppendLaunchKernel // CHECK: ---> urQueueFinish 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 3fe33410f6360..af20aa9477f2f 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 @@ -17,7 +17,7 @@ int main(int argc, char *argv[]) { auto ptr1 = malloc_shared(1, Q, ext::oneapi::property::usm::device_read_only()); // CHECK: ---> urUSMSharedAlloc - // CHECK-SAME:ZE ---> zeMemAllocShared + // CHECK:ZE ---> zeMemAllocShared auto ptr2 = aligned_alloc_shared( 1, 1, Q, ext::oneapi::property::usm::device_read_only()); 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 5bed10ff02591..735f25e77c528 100644 --- a/sycl/test-e2e/PropagateOptionsToBackend/sycl-opt-level-level-zero.cpp +++ b/sycl/test-e2e/PropagateOptionsToBackend/sycl-opt-level-level-zero.cpp @@ -28,5 +28,5 @@ int main() { return 0; } -// CHECK0: ---> urProgramBuild{{.*}}-ze-opt-disable{{.*}}-> UR_RESULT_SUCCESS -// CHECK1: ---> urProgramBuild{{.*}}-ze-opt-level=2{{.*}}-> UR_RESULT_SUCCESS +// CHECK0: <--- urProgramBuild{{.*}}-ze-opt-disable{{.*}}-> UR_RESULT_SUCCESS +// CHECK1: <--- urProgramBuild{{.*}}-ze-opt-level=2{{.*}}-> UR_RESULT_SUCCESS diff --git a/sycl/test-e2e/PropagateOptionsToBackend/sycl-opt-level-opencl.cpp b/sycl/test-e2e/PropagateOptionsToBackend/sycl-opt-level-opencl.cpp index 29f49ef69b74b..e44347c358553 100644 --- a/sycl/test-e2e/PropagateOptionsToBackend/sycl-opt-level-opencl.cpp +++ b/sycl/test-e2e/PropagateOptionsToBackend/sycl-opt-level-opencl.cpp @@ -31,7 +31,7 @@ int main() { return 0; } -// CHECKOCL0: urProgramBuild{{.*}}-cl-opt-disable -// CHECKOCL1-NOT: urProgramBuild{{.*}}-cl-opt-disable -// CHECKOCL2-NOT: urProgramBuild{{.*}}-cl-opt-disable -// CHECKOCL3-NOT: urProgramBuild{{.*}}-cl-opt-disable +// CHECKOCL0: ---> urProgramBuild{{.*}}-cl-opt-disable +// CHECKOCL1-NOT: ---> urProgramBuild{{.*}}-cl-opt-disable +// CHECKOCL2-NOT: ---> urProgramBuild{{.*}}-cl-opt-disable +// CHECKOCL3-NOT: ---> urProgramBuild{{.*}}-cl-opt-disable diff --git a/sycl/test-e2e/Regression/pi_release.cpp b/sycl/test-e2e/Regression/pi_release.cpp index 1a28a27d184d9..16d2a483e3d66 100644 --- a/sycl/test-e2e/Regression/pi_release.cpp +++ b/sycl/test-e2e/Regression/pi_release.cpp @@ -12,5 +12,5 @@ int main() { return 0; } -// CHECK: urQueueRelease -// CHECK: urContextRelease +// CHECK: ---> urQueueRelease +// CHECK: ---> urContextRelease diff --git a/sycl/test-e2e/Scheduler/InOrderQueueDeps.cpp b/sycl/test-e2e/Scheduler/InOrderQueueDeps.cpp index 4c5415631170d..05f8a1259ca6a 100644 --- a/sycl/test-e2e/Scheduler/InOrderQueueDeps.cpp +++ b/sycl/test-e2e/Scheduler/InOrderQueueDeps.cpp @@ -38,15 +38,15 @@ int main() { // Sequential submissions to the same in-order queue should not result in any // event dependencies. - // CHECK: urEnqueueKernelLaunch + // CHECK: ---> urEnqueueKernelLaunch // CHECK-SAME: .numEventsInWaitList = 0 submitKernel(InOrderQueueA, Buf); - // CHECK: urEnqueueKernelLaunch + // CHECK: ---> urEnqueueKernelLaunch // CHECK-SAME: .numEventsInWaitList = 0 submitKernel(InOrderQueueA, Buf); // Submisssion to a different in-order queue should explicitly depend on the // previous command group. - // CHECK: urEnqueueKernelLaunch + // CHECK: ---> urEnqueueKernelLaunch // CHECK-SAME: .numEventsInWaitList = 1 submitKernel(InOrderQueueB, Buf); diff --git a/sycl/test-e2e/Scheduler/MemObjRemapping.cpp b/sycl/test-e2e/Scheduler/MemObjRemapping.cpp index 7d5c1d5895a6f..f652db48ea42f 100644 --- a/sycl/test-e2e/Scheduler/MemObjRemapping.cpp +++ b/sycl/test-e2e/Scheduler/MemObjRemapping.cpp @@ -28,7 +28,7 @@ int main() { { // Check access mode flags - // CHECK: urEnqueueMemBufferMap + // CHECK: ---> urEnqueueMemBufferMap // CHECK: .mapFlags = UR_MAP_FLAG_READ auto AccA = BufA.get_access(); for (std::size_t I = 0; I < Size; ++I) { @@ -36,15 +36,15 @@ int main() { } } { - // CHECK: urEnqueueMemUnmap - // CHECK: urEnqueueMemBufferMap + // CHECK: ---> urEnqueueMemUnmap + // CHECK: ---> urEnqueueMemBufferMap // CHECK: .mapFlags = UR_MAP_FLAG_READ | UR_MAP_FLAG_WRITE auto AccA = BufA.get_access(); for (std::size_t I = 0; I < Size; ++I) AccA[I] = 2 * I; } - // CHECK-NOT: urEnqueueMemBufferMap + // CHECK-NOT: ---> urEnqueueMemBufferMap auto AccA = BufA.get_access(); for (std::size_t I = 0; I < Size; ++I) { assert(AccA[I] == 2 * I); diff --git a/sycl/test-e2e/Scheduler/SubBufferRemapping.cpp b/sycl/test-e2e/Scheduler/SubBufferRemapping.cpp index 350ee806c85eb..be0b0ede98b8d 100644 --- a/sycl/test-e2e/Scheduler/SubBufferRemapping.cpp +++ b/sycl/test-e2e/Scheduler/SubBufferRemapping.cpp @@ -6,12 +6,12 @@ // correct alloca, even in the case of sub-buffer accessors in host tasks. // CHECK: == fills completed -// CHECK: urEnqueueMemBufferMap -// CHECK: urEnqueueMemBufferMap +// CHECK: ---> urEnqueueMemBufferMap +// CHECK: ---> urEnqueueMemBufferMap // CHECK-SAME: .mapFlags = UR_MAP_FLAG_READ // CHECK: == between host accesses -// CHECK: urEnqueueMemBufferMap +// CHECK: ---> urEnqueueMemBufferMap // CHECK-SAME: .mapFlags = UR_MAP_FLAG_READ #include 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 f9bda47506515..30cd71b493b03 100644 --- a/sycl/test-e2e/SharedLib/use_when_link_verify_cache.cpp +++ b/sycl/test-e2e/SharedLib/use_when_link_verify_cache.cpp @@ -50,19 +50,19 @@ void run() { } int main() { #ifdef FOO_FIRST - // CHECK-FIRST: urProgramBuild + // CHECK-FIRST: ---> urProgramBuild // CHECK-FIRST: Foo: 1 // CHECK-FIRST: Foo: 1 assert(foo() == 1); assert(foo() == 1); #endif - // CHECK: urProgramBuild + // CHECK: ---> urProgramBuild // CHECK: Main: 2 // CHECK: Main: 2 run(); run(); #ifndef FOO_FIRST - // CHECK-LAST: urProgramBuild + // CHECK-LAST: ---> urProgramBuild // CHECK-LAST: Foo: 1 // CHECK-LAST: Foo: 1 assert(foo() == 1); 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 c0631389328be..00822a87a5ca8 100644 --- a/sycl/test-e2e/SharedLib/use_with_dlopen_verify_cache.cpp +++ b/sycl/test-e2e/SharedLib/use_with_dlopen_verify_cache.cpp @@ -61,7 +61,7 @@ void run() { } int main() { #ifdef RUN_FIRST - // CHECK-FIRST: urProgramBuild + // CHECK-FIRST: ---> urProgramBuild // CHECK-FIRST: Main: 2 // CHECK-FIRST: Main: 2 run(); @@ -77,21 +77,21 @@ int main() { *(void **)(&func) = dlsym(handle, "_Z3foov"); #ifdef RUN_MIDDLE_BEFORE - // CHECK-MIDDLE-BEFORE: urProgramBuild + // CHECK-MIDDLE-BEFORE: ---> urProgramBuild // CHECK-MIDDLE-BEFORE: Main: 2 // CHECK-MIDDLE-BEFORE: Main: 2 run(); run(); #endif - // CHECK: urProgramBuild + // CHECK: ---> urProgramBuild // CHECK: Foo: 1 // CHECK: Foo: 1 assert(func() == 1); assert(func() == 1); #ifdef RUN_MIDDLE_AFTER - // CHECK-MIDDLE-AFTER: urProgramBuild + // CHECK-MIDDLE-AFTER: ---> urProgramBuild // CHECK-MIDDLE-AFTER: Main: 2 // CHECK-MIDDLE-AFTER: Main: 2 run(); @@ -101,7 +101,7 @@ int main() { dlclose(handle); #ifdef RUN_LAST - // CHECK-LAST: urProgramBuild + // CHECK-LAST: ---> urProgramBuild // CHECK-LAST: Main: 2 // CHECK-LAST: Main: 2 run(); diff --git a/sycl/test-e2e/SpecConstants/2020/image_selection.cpp b/sycl/test-e2e/SpecConstants/2020/image_selection.cpp index 9d7a28074f679..a96dcc284f380 100644 --- a/sycl/test-e2e/SpecConstants/2020/image_selection.cpp +++ b/sycl/test-e2e/SpecConstants/2020/image_selection.cpp @@ -69,35 +69,35 @@ int main() { // a real pointer in urKernelSetArgMemObj. // CHECK-DEFAULT: Submission 0 - // CHECK-DEFAULT: ---> urKernelSetArgMemObj({{.*}}, .hArgValue = {{(0x)?[0-9,a-f,A-F]+}}) -> UR_RESULT_SUCCESS; + // CHECK-DEFAULT: <--- urKernelSetArgMemObj({{.*}}, .hArgValue = {{(0x)?[0-9,a-f,A-F]+}}) -> UR_RESULT_SUCCESS; // CHECK-DEFAULT: Default value of specialization constant was used. // CHECK-DEFAULT: Submission 1 - // CHECK-DEFAULT: ---> urKernelSetArgMemObj({{.*}}, .hArgValue = {{(0x)?[0-9,a-f,A-F]+}}) -> UR_RESULT_SUCCESS; + // CHECK-DEFAULT: <--- urKernelSetArgMemObj({{.*}}, .hArgValue = {{(0x)?[0-9,a-f,A-F]+}}) -> UR_RESULT_SUCCESS; // CHECK-DEFAULT: New specialization constant value was set. // CHECK-DEFAULT: Submission 2 - // CHECK-DEFAULT: ---> urKernelSetArgMemObj({{.*}}, .hArgValue = {{(0x)?[0-9,a-f,A-F]+}}) -> UR_RESULT_SUCCESS; + // CHECK-DEFAULT: <--- urKernelSetArgMemObj({{.*}}, .hArgValue = {{(0x)?[0-9,a-f,A-F]+}}) -> UR_RESULT_SUCCESS; // CHECK-DEFAULT: Default value of specialization constant was used. // CHECK-DEFAULT: Submission 3 - // CHECK-DEFAULT: ---> urKernelSetArgMemObj({{.*}}, .hArgValue = {{(0x)?[0-9,a-f,A-F]+}}) -> UR_RESULT_SUCCESS; + // CHECK-DEFAULT: <--- urKernelSetArgMemObj({{.*}}, .hArgValue = {{(0x)?[0-9,a-f,A-F]+}}) -> UR_RESULT_SUCCESS; // CHECK-DEFAULT: New specialization constant value was set. // CHECK-ENABLED: Submission 0 - // CHECK-ENABLED: ---> urKernelSetArgMemObj({{.*}}, .hArgValue = nullptr) -> UR_RESULT_SUCCESS; + // CHECK-ENABLED: <--- urKernelSetArgMemObj({{.*}}, .hArgValue = nullptr) -> UR_RESULT_SUCCESS; // CHECK-ENABLED: Default value of specialization constant was used. // CHECK-ENABLED: Submission 1 - // CHECK-ENABLED: ---> urKernelSetArgMemObj({{.*}}, .hArgValue = {{(0x)?[0-9,a-f,A-F]+}}) -> UR_RESULT_SUCCESS; + // CHECK-ENABLED: <--- urKernelSetArgMemObj({{.*}}, .hArgValue = {{(0x)?[0-9,a-f,A-F]+}}) -> UR_RESULT_SUCCESS; // CHECK-ENABLED: New specialization constant value was set. // CHECK-ENABLED: Submission 2 - // CHECK-ENABLED: ---> urKernelSetArgMemObj({{.*}}, .hArgValue = nullptr) -> UR_RESULT_SUCCESS; + // CHECK-ENABLED: <--- urKernelSetArgMemObj({{.*}}, .hArgValue = nullptr) -> UR_RESULT_SUCCESS; // CHECK-ENABLED: Default value of specialization constant was used. // CHECK-ENABLED: Submission 3 - // CHECK-ENABLED: ---> urKernelSetArgMemObj({{.*}}, .hArgValue = {{(0x)?[0-9,a-f,A-F]+}}) -> UR_RESULT_SUCCESS; + // CHECK-ENABLED: <--- urKernelSetArgMemObj({{.*}}, .hArgValue = {{(0x)?[0-9,a-f,A-F]+}}) -> UR_RESULT_SUCCESS; // CHECK-ENABLED: New specialization constant value was set. // CHECK-MIX: Submission 0 @@ -137,11 +137,11 @@ int main() { // default, that's why nullptr is set as 4th parameter of // urKernelSetArgMemObj. // CHECK-DEFAULT: Kernel bundle - // CHECK-DEFAULT: ---> urKernelSetArgMemObj({{.*}}, .hArgValue = {{(0x)?[0-9,a-f,A-F]+}}) -> UR_RESULT_SUCCESS; + // CHECK-DEFAULT: <--- urKernelSetArgMemObj({{.*}}, .hArgValue = {{(0x)?[0-9,a-f,A-F]+}}) -> UR_RESULT_SUCCESS; // CHECK-DEFAULT: Default value of specialization constant was used. // CHECK-ENABLED: Kernel bundle - // CHECK-ENABLED: ---> urKernelSetArgMemObj({{.*}}, .hArgValue = nullptr) -> UR_RESULT_SUCCESS; + // CHECK-ENABLED: <--- urKernelSetArgMemObj({{.*}}, .hArgValue = nullptr) -> UR_RESULT_SUCCESS; // CHECK-ENABLED: Default value of specialization constant was used. // CHECK-MIX: Kernel bundle @@ -169,7 +169,7 @@ int main() { // constants. We are verifying that by checking the 4th parameter is set to // zero. // CHECK-DEFAULT-EXPLICIT-SET: Default value was explicitly set - // CHECK-DEFAULT-EXPLICIT-SET: ---> urKernelSetArgMemObj({{.*}}, .hArgValue = nullptr) -> UR_RESULT_SUCCESS; + // CHECK-DEFAULT-EXPLICIT-SET: <--- urKernelSetArgMemObj({{.*}}, .hArgValue = nullptr) -> UR_RESULT_SUCCESS; // CHECK-DEFAULT-EXPLICIT-SET: Default value of specialization constant was used. std::cout << "Default value was explicitly set" << std::endl; Q.submit([&](sycl::handler &cgh) { @@ -192,7 +192,7 @@ int main() { // values of specialization constants. We are verifying that by checking the // 4th parameter is set to zero. // CHECK-DEFAULT-BACK-TO-DEFAULT: Changed to new value and then default value was explicitly set - // CHECK-DEFAULT-BACK-TO-DEFAULT: ---> urKernelSetArgMemObj({{.*}}, .hArgValue = nullptr) -> UR_RESULT_SUCCESS; + // CHECK-DEFAULT-BACK-TO-DEFAULT: <--- urKernelSetArgMemObj({{.*}}, .hArgValue = nullptr) -> UR_RESULT_SUCCESS; // CHECK-DEFAULT-BACK-TO-DEFAULT: Default value of specialization constant was used. std::cout << "Changed to new value and then default value was explicitly set" << std::endl; diff --git a/sycl/test-e2e/SpecConstants/2020/non_native/SpecConstBuffer.cpp b/sycl/test-e2e/SpecConstants/2020/non_native/SpecConstBuffer.cpp index 675e842ce4ceb..04ea835e311be 100644 --- a/sycl/test-e2e/SpecConstants/2020/non_native/SpecConstBuffer.cpp +++ b/sycl/test-e2e/SpecConstants/2020/non_native/SpecConstBuffer.cpp @@ -20,5 +20,5 @@ int main() { }); Q.wait(); return 0; - // CHECK: urMemRelease + // CHECK: ---> urMemRelease }