From 9bc59d292596cc272fd6a3786755fe618ec44ceb Mon Sep 17 00:00:00 2001 From: Jakub Chlanda Date: Tue, 12 Jul 2022 08:38:29 +0100 Subject: [PATCH 1/2] [SYCL] Use SYCL_PI_SUPPRESS_ERROR_MESSAGE in simultaneous assert tests --- SYCL/Assert/assert_in_simultaneous_kernels.cpp | 4 +++- SYCL/Assert/assert_in_simultaneously_multiple_tus.cpp | 4 +++- .../assert_in_simultaneously_multiple_tus_one_ndebug.cpp | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/SYCL/Assert/assert_in_simultaneous_kernels.cpp b/SYCL/Assert/assert_in_simultaneous_kernels.cpp index c9d82dce6d..e85b7206e9 100644 --- a/SYCL/Assert/assert_in_simultaneous_kernels.cpp +++ b/SYCL/Assert/assert_in_simultaneous_kernels.cpp @@ -10,7 +10,9 @@ // too early. This is necessary because currently SYCL RT sets indirect access // flag for all kernels and the Level Zero runtime doesn't support deferred // release yet. -// RUN: env SYCL_PI_LEVEL_ZERO_TRACK_INDIRECT_ACCESS_MEMORY=1 %GPU_RUN_PLACEHOLDER %t.out &> %t.txt || true +// Suppress runtime from printing out error messages, so that the test can +// match on assert message generated by the toolchains. +// RUN: env SYCL_PI_LEVEL_ZERO_TRACK_INDIRECT_ACCESS_MEMORY=1 env SYCL_PI_SUPPRESS_ERROR_MESSAGE=1 %GPU_RUN_PLACEHOLDER %t.out &> %t.txt || true // RUN: %GPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt // Shouldn't fail on ACC as fallback assert isn't enqueued there // RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.txt diff --git a/SYCL/Assert/assert_in_simultaneously_multiple_tus.cpp b/SYCL/Assert/assert_in_simultaneously_multiple_tus.cpp index d47328b5d1..c207fbbe4d 100644 --- a/SYCL/Assert/assert_in_simultaneously_multiple_tus.cpp +++ b/SYCL/Assert/assert_in_simultaneously_multiple_tus.cpp @@ -10,7 +10,9 @@ // too early. This is necessary because currently SYCL RT sets indirect access // flag for all kernels and the Level Zero runtime doesn't support deferred // release yet. -// RUN: env SYCL_PI_LEVEL_ZERO_TRACK_INDIRECT_ACCESS_MEMORY=1 %GPU_RUN_PLACEHOLDER %t.out &> %t.txt || true +// Suppress runtime from printing out error messages, so that the test can +// match on assert message generated by the toolchains. +// RUN: env SYCL_PI_LEVEL_ZERO_TRACK_INDIRECT_ACCESS_MEMORY=1 env SYCL_PI_SUPPRESS_ERROR_MESSAGE=1 %GPU_RUN_PLACEHOLDER %t.out &> %t.txt || true // RUN: %GPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt // Shouldn't fail on ACC as fallback assert isn't enqueued there // RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.txt diff --git a/SYCL/Assert/assert_in_simultaneously_multiple_tus_one_ndebug.cpp b/SYCL/Assert/assert_in_simultaneously_multiple_tus_one_ndebug.cpp index ded5709024..1095cb2ac3 100644 --- a/SYCL/Assert/assert_in_simultaneously_multiple_tus_one_ndebug.cpp +++ b/SYCL/Assert/assert_in_simultaneously_multiple_tus_one_ndebug.cpp @@ -9,7 +9,9 @@ // too early. This is necessary because currently SYCL RT sets indirect access // flag for all kernels and the Level Zero runtime doesn't support deferred // release yet. -// RUN: env SYCL_PI_LEVEL_ZERO_TRACK_INDIRECT_ACCESS_MEMORY=1 %GPU_RUN_PLACEHOLDER %t.out &> %t.txt || true +// Suppress runtime from printing out error messages, so that the test can +// match on assert message generated by the toolchains. +// RUN: env SYCL_PI_LEVEL_ZERO_TRACK_INDIRECT_ACCESS_MEMORY=1 env SYCL_PI_SUPPRESS_ERROR_MESSAGE=1 %GPU_RUN_PLACEHOLDER %t.out &> %t.txt || true // RUN: %GPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt // Shouldn't fail on ACC as fallback assert isn't enqueued there // RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.txt From b673cee2769fe118d6f05293b0423c441602af10 Mon Sep 17 00:00:00 2001 From: Jakub Chlanda Date: Wed, 13 Jul 2022 07:31:48 +0100 Subject: [PATCH 2/2] Use only one env --- SYCL/Assert/assert_in_simultaneous_kernels.cpp | 2 +- SYCL/Assert/assert_in_simultaneously_multiple_tus.cpp | 2 +- .../Assert/assert_in_simultaneously_multiple_tus_one_ndebug.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/SYCL/Assert/assert_in_simultaneous_kernels.cpp b/SYCL/Assert/assert_in_simultaneous_kernels.cpp index e85b7206e9..21290e6d9b 100644 --- a/SYCL/Assert/assert_in_simultaneous_kernels.cpp +++ b/SYCL/Assert/assert_in_simultaneous_kernels.cpp @@ -12,7 +12,7 @@ // release yet. // Suppress runtime from printing out error messages, so that the test can // match on assert message generated by the toolchains. -// RUN: env SYCL_PI_LEVEL_ZERO_TRACK_INDIRECT_ACCESS_MEMORY=1 env SYCL_PI_SUPPRESS_ERROR_MESSAGE=1 %GPU_RUN_PLACEHOLDER %t.out &> %t.txt || true +// RUN: env SYCL_PI_LEVEL_ZERO_TRACK_INDIRECT_ACCESS_MEMORY=1 SYCL_PI_SUPPRESS_ERROR_MESSAGE=1 %GPU_RUN_PLACEHOLDER %t.out &> %t.txt || true // RUN: %GPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt // Shouldn't fail on ACC as fallback assert isn't enqueued there // RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.txt diff --git a/SYCL/Assert/assert_in_simultaneously_multiple_tus.cpp b/SYCL/Assert/assert_in_simultaneously_multiple_tus.cpp index c207fbbe4d..976904ad50 100644 --- a/SYCL/Assert/assert_in_simultaneously_multiple_tus.cpp +++ b/SYCL/Assert/assert_in_simultaneously_multiple_tus.cpp @@ -12,7 +12,7 @@ // release yet. // Suppress runtime from printing out error messages, so that the test can // match on assert message generated by the toolchains. -// RUN: env SYCL_PI_LEVEL_ZERO_TRACK_INDIRECT_ACCESS_MEMORY=1 env SYCL_PI_SUPPRESS_ERROR_MESSAGE=1 %GPU_RUN_PLACEHOLDER %t.out &> %t.txt || true +// RUN: env SYCL_PI_LEVEL_ZERO_TRACK_INDIRECT_ACCESS_MEMORY=1 SYCL_PI_SUPPRESS_ERROR_MESSAGE=1 %GPU_RUN_PLACEHOLDER %t.out &> %t.txt || true // RUN: %GPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt // Shouldn't fail on ACC as fallback assert isn't enqueued there // RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.txt diff --git a/SYCL/Assert/assert_in_simultaneously_multiple_tus_one_ndebug.cpp b/SYCL/Assert/assert_in_simultaneously_multiple_tus_one_ndebug.cpp index 1095cb2ac3..dfb992a6a7 100644 --- a/SYCL/Assert/assert_in_simultaneously_multiple_tus_one_ndebug.cpp +++ b/SYCL/Assert/assert_in_simultaneously_multiple_tus_one_ndebug.cpp @@ -11,7 +11,7 @@ // release yet. // Suppress runtime from printing out error messages, so that the test can // match on assert message generated by the toolchains. -// RUN: env SYCL_PI_LEVEL_ZERO_TRACK_INDIRECT_ACCESS_MEMORY=1 env SYCL_PI_SUPPRESS_ERROR_MESSAGE=1 %GPU_RUN_PLACEHOLDER %t.out &> %t.txt || true +// RUN: env SYCL_PI_LEVEL_ZERO_TRACK_INDIRECT_ACCESS_MEMORY=1 SYCL_PI_SUPPRESS_ERROR_MESSAGE=1 %GPU_RUN_PLACEHOLDER %t.out &> %t.txt || true // RUN: %GPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt // Shouldn't fail on ACC as fallback assert isn't enqueued there // RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.txt