From bac8381d90a94f5edee81ee92777ee1a2147a10f Mon Sep 17 00:00:00 2001 From: Dongkyun Ahn Date: Sun, 16 Jan 2022 11:29:53 -0800 Subject: [PATCH 1/6] [SYCL][ESIMD] Preparing ESIMD_EMULATOR support - This PR is for clearing failures observed while merging intel/llvm PR enabling esimd_emulator support by default (https://github.com/intel/llvm/pull/5058) - Another PR should be created for actively loading and testing 'esimd_emulator' backend --- SYCL/KernelAndProgram/cache_env_vars.cpp | 10 +++++----- SYCL/KernelAndProgram/cache_env_vars_lin.cpp | 16 ++++++++-------- SYCL/SpecConstants/2020/host_apis.cpp | 1 + 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/SYCL/KernelAndProgram/cache_env_vars.cpp b/SYCL/KernelAndProgram/cache_env_vars.cpp index a25edfb33c..657c5e6b7c 100644 --- a/SYCL/KernelAndProgram/cache_env_vars.cpp +++ b/SYCL/KernelAndProgram/cache_env_vars.cpp @@ -3,15 +3,15 @@ // RUN: rm -rf %t/cache_dir // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -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_PI_TRACE=-1 %t.out | FileCheck %s --check-prefixes=CHECK-BUILD +// RUN: env SYCL_DEVICE_FILTER=%sycl_be SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_PI_TRACE=-1 %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_PI_TRACE=-1 SYCL_CACHE_MIN_DEVICE_IMAGE_SIZE=100000 %t.out | FileCheck %s --check-prefixes=CHECK-BUILD +// RUN: env SYCL_DEVICE_FILTER=%sycl_be SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_PI_TRACE=-1 SYCL_CACHE_MIN_DEVICE_IMAGE_SIZE=100000 %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_PI_TRACE=-1 SYCL_CACHE_MAX_DEVICE_IMAGE_SIZE=1000 %t.out | FileCheck %s --check-prefixes=CHECK-BUILD +// RUN: env SYCL_DEVICE_FILTER=%sycl_be SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_PI_TRACE=-1 SYCL_CACHE_MAX_DEVICE_IMAGE_SIZE=1000 %t.out | FileCheck %s --check-prefixes=CHECK-BUILD // Use cache -// RUN: env SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_PI_TRACE=-1 %t.out | FileCheck %s --check-prefixes=CHECK-CACHE +// RUN: env SYCL_DEVICE_FILTER=%sycl_be SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_PI_TRACE=-1 %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_PI_TRACE=-1 %t.out | FileCheck %s --check-prefixes=CHECK-BUILD +// RUN: env SYCL_DEVICE_FILTER=%sycl_be SYCL_CACHE_PERSISTENT=0 SYCL_CACHE_DIR=%t/cache_dir SYCL_PI_TRACE=-1 %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: diff --git a/SYCL/KernelAndProgram/cache_env_vars_lin.cpp b/SYCL/KernelAndProgram/cache_env_vars_lin.cpp index 6dded2e3c8..d3b42806ee 100644 --- a/SYCL/KernelAndProgram/cache_env_vars_lin.cpp +++ b/SYCL/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_PI_TRACE=-1 %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_PI_TRACE=-1 %t.out | FileCheck %s --check-prefixes=CHECK-BUILD +// RUN: env SYCL_BE=%sycl_be SYCL_CACHE_PERSISTENT=1 env -u SYCL_CACHE_DIR env -u HOME env -u XDG_CACHE_HOME SYCL_PI_TRACE=-1 %t.out | FileCheck %s --check-prefixes=CHECK-BUILD +// RUN: env SYCL_BE=%sycl_be SYCL_CACHE_PERSISTENT=1 env -u SYCL_CACHE_DIR env -u HOME env -u XDG_CACHE_HOME SYCL_PI_TRACE=-1 %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_PI_TRACE=-1 env -u SYCL_CACHE_DIR env -u HOME %t.out | FileCheck %s --check-prefixes=CHECK-BUILD -// RUN: env SYCL_CACHE_PERSISTENT=1 XDG_CACHE_HOME=%t/cache_dir SYCL_PI_TRACE=-1 env -u SYCL_CACHE_DIR env -u HOME %t.out | FileCheck %s --check-prefixes=CHECK-CACHE +// RUN: env SYCL_BE=%sycl_be SYCL_CACHE_PERSISTENT=1 XDG_CACHE_HOME=%t/cache_dir SYCL_PI_TRACE=-1 env -u SYCL_CACHE_DIR env -u HOME %t.out | FileCheck %s --check-prefixes=CHECK-BUILD +// RUN: env SYCL_BE=%sycl_be SYCL_CACHE_PERSISTENT=1 XDG_CACHE_HOME=%t/cache_dir SYCL_PI_TRACE=-1 env -u SYCL_CACHE_DIR env -u HOME %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_PI_TRACE=-1 env -u XDG_CACHE_HOME env -u HOME %t.out | FileCheck %s --check-prefixes=CHECK-BUILD -// RUN: env SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_PI_TRACE=-1 env -u XDG_CACHE_HOME env -u HOME %t.out %t.out | FileCheck %s --check-prefixes=CHECK-CACHE +// RUN: env SYCL_BE=%sycl_be SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_PI_TRACE=-1 env -u XDG_CACHE_HOME env -u HOME %t.out | FileCheck %s --check-prefixes=CHECK-BUILD +// RUN: env SYCL_BE=%sycl_be SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_PI_TRACE=-1 env -u XDG_CACHE_HOME env -u HOME %t.out %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_PI_TRACE=-1 env -u XDG_CACHE_HOME env -u SYCL_CACHE_DIR %t.out | FileCheck %s --check-prefixes=CHECK-BUILD -// RUN: env SYCL_CACHE_PERSISTENT=1 HOME=%t/cache_dir SYCL_PI_TRACE=-1 env -u XDG_CACHE_HOME env -u SYCL_CACHE_DIR %t.out | FileCheck %s --check-prefixes=CHECK-CACHE +// RUN: env SYCL_BE=%sycl_be SYCL_CACHE_PERSISTENT=1 HOME=%t/cache_dir SYCL_PI_TRACE=-1 env -u XDG_CACHE_HOME env -u SYCL_CACHE_DIR %t.out | FileCheck %s --check-prefixes=CHECK-BUILD +// RUN: env SYCL_BE=%sycl_be SYCL_CACHE_PERSISTENT=1 HOME=%t/cache_dir SYCL_PI_TRACE=-1 env -u XDG_CACHE_HOME env -u SYCL_CACHE_DIR %t.out | FileCheck %s --check-prefixes=CHECK-CACHE // CHECK-BUILD-NOT: piProgramCreateWithBinary( // CHECK-BUILD: piProgramCreate( diff --git a/SYCL/SpecConstants/2020/host_apis.cpp b/SYCL/SpecConstants/2020/host_apis.cpp index c8fd72ae39..7fb4be4181 100644 --- a/SYCL/SpecConstants/2020/host_apis.cpp +++ b/SYCL/SpecConstants/2020/host_apis.cpp @@ -4,6 +4,7 @@ // UNSUPPORTED: cuda // UNSUPPORTED: hip +// UNSUPPORTED: esimd_emulator #include From f98de43826b2ca697a57ff100b116864109e9b8d Mon Sep 17 00:00:00 2001 From: Dongkyun Ahn Date: Sun, 16 Jan 2022 11:35:18 -0800 Subject: [PATCH 2/6] Disabling assert/assert-aot.cpp for esimd_emulator --- SYCL/DeviceLib/assert-aot.cpp | 1 + SYCL/DeviceLib/assert.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/SYCL/DeviceLib/assert-aot.cpp b/SYCL/DeviceLib/assert-aot.cpp index 9f2b6e8559..aed88d2152 100644 --- a/SYCL/DeviceLib/assert-aot.cpp +++ b/SYCL/DeviceLib/assert-aot.cpp @@ -1,4 +1,5 @@ // REQUIRES: opencl-aot, cpu, linux +// UNSUPPORTED: esimd_emulator // RUN: %clangxx -DSYCL_ENABLE_FALLBACK_ASSERT -fsycl -fsycl-targets=spir64_x86_64 %S/assert.cpp -o %t.aot.out // RUN: %CPU_RUN_PLACEHOLDER EXPECTED_SIGNAL=SIGABRT SHOULD_CRASH=1 %t.aot.out 2>%t.aot.msg diff --git a/SYCL/DeviceLib/assert.cpp b/SYCL/DeviceLib/assert.cpp index c3a28c85af..6ab4f13fc0 100644 --- a/SYCL/DeviceLib/assert.cpp +++ b/SYCL/DeviceLib/assert.cpp @@ -1,4 +1,5 @@ // REQUIRES: cpu,linux +// UNSUPPORTED: esimd_emulator // RUN: %clangxx -DSYCL_ENABLE_FALLBACK_ASSERT -fsycl %s -o %t.out // (see the other RUN lines below; it is a bit complicated) // From e4ff048b849864262f7410a5ba1eea226e9d3a77 Mon Sep 17 00:00:00 2001 From: Dongkyun Ahn Date: Sun, 16 Jan 2022 11:41:30 -0800 Subject: [PATCH 3/6] Environment variable typo fix --- SYCL/KernelAndProgram/cache_env_vars_lin.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/SYCL/KernelAndProgram/cache_env_vars_lin.cpp b/SYCL/KernelAndProgram/cache_env_vars_lin.cpp index d3b42806ee..7671f96dfc 100644 --- a/SYCL/KernelAndProgram/cache_env_vars_lin.cpp +++ b/SYCL/KernelAndProgram/cache_env_vars_lin.cpp @@ -13,14 +13,14 @@ // When any of environment variables pointing to cache root is present cache is // enabled // RUN: rm -rf %t/cache_dir -// RUN: env SYCL_BE=%sycl_be SYCL_CACHE_PERSISTENT=1 XDG_CACHE_HOME=%t/cache_dir SYCL_PI_TRACE=-1 env -u SYCL_CACHE_DIR env -u HOME %t.out | FileCheck %s --check-prefixes=CHECK-BUILD -// RUN: env SYCL_BE=%sycl_be SYCL_CACHE_PERSISTENT=1 XDG_CACHE_HOME=%t/cache_dir SYCL_PI_TRACE=-1 env -u SYCL_CACHE_DIR env -u HOME %t.out | FileCheck %s --check-prefixes=CHECK-CACHE +// RUN: env SYCL_DEVICE_FILTER=%sycl_be SYCL_CACHE_PERSISTENT=1 XDG_CACHE_HOME=%t/cache_dir SYCL_PI_TRACE=-1 env -u SYCL_CACHE_DIR env -u HOME %t.out | FileCheck %s --check-prefixes=CHECK-BUILD +// RUN: env SYCL_DEVICE_FILTER=%sycl_be SYCL_CACHE_PERSISTENT=1 XDG_CACHE_HOME=%t/cache_dir SYCL_PI_TRACE=-1 env -u SYCL_CACHE_DIR env -u HOME %t.out | FileCheck %s --check-prefixes=CHECK-CACHE // RUN: rm -rf %t/cache_dir -// RUN: env SYCL_BE=%sycl_be SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_PI_TRACE=-1 env -u XDG_CACHE_HOME env -u HOME %t.out | FileCheck %s --check-prefixes=CHECK-BUILD -// RUN: env SYCL_BE=%sycl_be SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_PI_TRACE=-1 env -u XDG_CACHE_HOME env -u HOME %t.out %t.out | FileCheck %s --check-prefixes=CHECK-CACHE +// RUN: env SYCL_DEVICE_FILTER=%sycl_be SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_PI_TRACE=-1 env -u XDG_CACHE_HOME env -u HOME %t.out | FileCheck %s --check-prefixes=CHECK-BUILD +// RUN: env SYCL_DEVICE_FILTER=%sycl_be SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_PI_TRACE=-1 env -u XDG_CACHE_HOME env -u HOME %t.out %t.out | FileCheck %s --check-prefixes=CHECK-CACHE // RUN: rm -rf %t/cache_dir -// RUN: env SYCL_BE=%sycl_be SYCL_CACHE_PERSISTENT=1 HOME=%t/cache_dir SYCL_PI_TRACE=-1 env -u XDG_CACHE_HOME env -u SYCL_CACHE_DIR %t.out | FileCheck %s --check-prefixes=CHECK-BUILD -// RUN: env SYCL_BE=%sycl_be SYCL_CACHE_PERSISTENT=1 HOME=%t/cache_dir SYCL_PI_TRACE=-1 env -u XDG_CACHE_HOME env -u SYCL_CACHE_DIR %t.out | FileCheck %s --check-prefixes=CHECK-CACHE +// RUN: env SYCL_DEVICE_FILTER=%sycl_be SYCL_CACHE_PERSISTENT=1 HOME=%t/cache_dir SYCL_PI_TRACE=-1 env -u XDG_CACHE_HOME env -u SYCL_CACHE_DIR %t.out | FileCheck %s --check-prefixes=CHECK-BUILD +// RUN: env SYCL_DEVICE_FILTER=%sycl_be SYCL_CACHE_PERSISTENT=1 HOME=%t/cache_dir SYCL_PI_TRACE=-1 env -u XDG_CACHE_HOME env -u SYCL_CACHE_DIR %t.out | FileCheck %s --check-prefixes=CHECK-CACHE // CHECK-BUILD-NOT: piProgramCreateWithBinary( // CHECK-BUILD: piProgramCreate( From fb518ff771c95cc050c51a336e1f0cfd2bf6637d Mon Sep 17 00:00:00 2001 From: vladimirlaz Date: Mon, 17 Jan 2022 09:23:16 +0300 Subject: [PATCH 4/6] Make test respect target BE settings --- SYCL/DeviceLib/assert-aot.cpp | 1 - SYCL/DeviceLib/assert.cpp | 1 - SYCL/KernelAndProgram/cache_env_vars.cpp | 10 +++++----- SYCL/KernelAndProgram/cache_env_vars_lin.cpp | 16 ++++++++-------- SYCL/SpecConstants/2020/host_apis.cpp | 1 - 5 files changed, 13 insertions(+), 16 deletions(-) diff --git a/SYCL/DeviceLib/assert-aot.cpp b/SYCL/DeviceLib/assert-aot.cpp index aed88d2152..9f2b6e8559 100644 --- a/SYCL/DeviceLib/assert-aot.cpp +++ b/SYCL/DeviceLib/assert-aot.cpp @@ -1,5 +1,4 @@ // REQUIRES: opencl-aot, cpu, linux -// UNSUPPORTED: esimd_emulator // RUN: %clangxx -DSYCL_ENABLE_FALLBACK_ASSERT -fsycl -fsycl-targets=spir64_x86_64 %S/assert.cpp -o %t.aot.out // RUN: %CPU_RUN_PLACEHOLDER EXPECTED_SIGNAL=SIGABRT SHOULD_CRASH=1 %t.aot.out 2>%t.aot.msg diff --git a/SYCL/DeviceLib/assert.cpp b/SYCL/DeviceLib/assert.cpp index 6ab4f13fc0..c3a28c85af 100644 --- a/SYCL/DeviceLib/assert.cpp +++ b/SYCL/DeviceLib/assert.cpp @@ -1,5 +1,4 @@ // REQUIRES: cpu,linux -// UNSUPPORTED: esimd_emulator // RUN: %clangxx -DSYCL_ENABLE_FALLBACK_ASSERT -fsycl %s -o %t.out // (see the other RUN lines below; it is a bit complicated) // diff --git a/SYCL/KernelAndProgram/cache_env_vars.cpp b/SYCL/KernelAndProgram/cache_env_vars.cpp index 657c5e6b7c..d0105af10d 100644 --- a/SYCL/KernelAndProgram/cache_env_vars.cpp +++ b/SYCL/KernelAndProgram/cache_env_vars.cpp @@ -3,15 +3,15 @@ // RUN: rm -rf %t/cache_dir // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -DTARGET_IMAGE=INC100 // Build program and add item to cache -// RUN: env SYCL_DEVICE_FILTER=%sycl_be SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_PI_TRACE=-1 %t.out | FileCheck %s --check-prefixes=CHECK-BUILD +// RUN: %BE_RUN_PLACEHOLDER SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_PI_TRACE=-1 %t.out | FileCheck %s --check-prefixes=CHECK-BUILD // Ignore caching because image size is less than threshold -// RUN: env SYCL_DEVICE_FILTER=%sycl_be SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_PI_TRACE=-1 SYCL_CACHE_MIN_DEVICE_IMAGE_SIZE=100000 %t.out | FileCheck %s --check-prefixes=CHECK-BUILD +// RUN: %BE_RUN_PLACEHOLDER SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_PI_TRACE=-1 SYCL_CACHE_MIN_DEVICE_IMAGE_SIZE=100000 %t.out | FileCheck %s --check-prefixes=CHECK-BUILD // Ignore caching because image size is more than threshold -// RUN: env SYCL_DEVICE_FILTER=%sycl_be SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_PI_TRACE=-1 SYCL_CACHE_MAX_DEVICE_IMAGE_SIZE=1000 %t.out | FileCheck %s --check-prefixes=CHECK-BUILD +// RUN: %BE_RUN_PLACEHOLDER SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_PI_TRACE=-1 SYCL_CACHE_MAX_DEVICE_IMAGE_SIZE=1000 %t.out | FileCheck %s --check-prefixes=CHECK-BUILD // Use cache -// RUN: env SYCL_DEVICE_FILTER=%sycl_be SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_PI_TRACE=-1 %t.out | FileCheck %s --check-prefixes=CHECK-CACHE +// RUN: %BE_RUN_PLACEHOLDER SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_PI_TRACE=-1 %t.out | FileCheck %s --check-prefixes=CHECK-CACHE // Ignore cache because of environment variable -// RUN: env SYCL_DEVICE_FILTER=%sycl_be SYCL_CACHE_PERSISTENT=0 SYCL_CACHE_DIR=%t/cache_dir SYCL_PI_TRACE=-1 %t.out | FileCheck %s --check-prefixes=CHECK-BUILD +// RUN: %BE_RUN_PLACEHOLDER SYCL_CACHE_PERSISTENT=0 SYCL_CACHE_DIR=%t/cache_dir SYCL_PI_TRACE=-1 %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: diff --git a/SYCL/KernelAndProgram/cache_env_vars_lin.cpp b/SYCL/KernelAndProgram/cache_env_vars_lin.cpp index 7671f96dfc..8779f607ed 100644 --- a/SYCL/KernelAndProgram/cache_env_vars_lin.cpp +++ b/SYCL/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_BE=%sycl_be SYCL_CACHE_PERSISTENT=1 env -u SYCL_CACHE_DIR env -u HOME env -u XDG_CACHE_HOME SYCL_PI_TRACE=-1 %t.out | FileCheck %s --check-prefixes=CHECK-BUILD -// RUN: env SYCL_BE=%sycl_be SYCL_CACHE_PERSISTENT=1 env -u SYCL_CACHE_DIR env -u HOME env -u XDG_CACHE_HOME SYCL_PI_TRACE=-1 %t.out | FileCheck %s --check-prefixes=CHECK-BUILD +// RUN: %BE_RUN_PLACEHOLDER SYCL_CACHE_PERSISTENT=1 env -u SYCL_CACHE_DIR env -u HOME env -u XDG_CACHE_HOME SYCL_PI_TRACE=-1 %t.out | FileCheck %s --check-prefixes=CHECK-BUILD +// RUN: %BE_RUN_PLACEHOLDER SYCL_CACHE_PERSISTENT=1 env -u SYCL_CACHE_DIR env -u HOME env -u XDG_CACHE_HOME SYCL_PI_TRACE=-1 %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_DEVICE_FILTER=%sycl_be SYCL_CACHE_PERSISTENT=1 XDG_CACHE_HOME=%t/cache_dir SYCL_PI_TRACE=-1 env -u SYCL_CACHE_DIR env -u HOME %t.out | FileCheck %s --check-prefixes=CHECK-BUILD -// RUN: env SYCL_DEVICE_FILTER=%sycl_be SYCL_CACHE_PERSISTENT=1 XDG_CACHE_HOME=%t/cache_dir SYCL_PI_TRACE=-1 env -u SYCL_CACHE_DIR env -u HOME %t.out | FileCheck %s --check-prefixes=CHECK-CACHE +// RUN: %BE_RUN_PLACEHOLDER SYCL_CACHE_PERSISTENT=1 XDG_CACHE_HOME=%t/cache_dir SYCL_PI_TRACE=-1 env -u SYCL_CACHE_DIR env -u HOME %t.out | FileCheck %s --check-prefixes=CHECK-BUILD +// RUN: %BE_RUN_PLACEHOLDER SYCL_CACHE_PERSISTENT=1 XDG_CACHE_HOME=%t/cache_dir SYCL_PI_TRACE=-1 env -u SYCL_CACHE_DIR env -u HOME %t.out | FileCheck %s --check-prefixes=CHECK-CACHE // RUN: rm -rf %t/cache_dir -// RUN: env SYCL_DEVICE_FILTER=%sycl_be SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_PI_TRACE=-1 env -u XDG_CACHE_HOME env -u HOME %t.out | FileCheck %s --check-prefixes=CHECK-BUILD -// RUN: env SYCL_DEVICE_FILTER=%sycl_be SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_PI_TRACE=-1 env -u XDG_CACHE_HOME env -u HOME %t.out %t.out | FileCheck %s --check-prefixes=CHECK-CACHE +// RUN: %BE_RUN_PLACEHOLDER SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_PI_TRACE=-1 env -u XDG_CACHE_HOME env -u HOME %t.out | FileCheck %s --check-prefixes=CHECK-BUILD +// RUN: %BE_RUN_PLACEHOLDER SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_DIR=%t/cache_dir SYCL_PI_TRACE=-1 env -u XDG_CACHE_HOME env -u HOME %t.out %t.out | FileCheck %s --check-prefixes=CHECK-CACHE // RUN: rm -rf %t/cache_dir -// RUN: env SYCL_DEVICE_FILTER=%sycl_be SYCL_CACHE_PERSISTENT=1 HOME=%t/cache_dir SYCL_PI_TRACE=-1 env -u XDG_CACHE_HOME env -u SYCL_CACHE_DIR %t.out | FileCheck %s --check-prefixes=CHECK-BUILD -// RUN: env SYCL_DEVICE_FILTER=%sycl_be SYCL_CACHE_PERSISTENT=1 HOME=%t/cache_dir SYCL_PI_TRACE=-1 env -u XDG_CACHE_HOME env -u SYCL_CACHE_DIR %t.out | FileCheck %s --check-prefixes=CHECK-CACHE +// RUN: %BE_RUN_PLACEHOLDER SYCL_CACHE_PERSISTENT=1 HOME=%t/cache_dir SYCL_PI_TRACE=-1 env -u XDG_CACHE_HOME env -u SYCL_CACHE_DIR %t.out | FileCheck %s --check-prefixes=CHECK-BUILD +// RUN: %BE_RUN_PLACEHOLDER SYCL_CACHE_PERSISTENT=1 HOME=%t/cache_dir SYCL_PI_TRACE=-1 env -u XDG_CACHE_HOME env -u SYCL_CACHE_DIR %t.out | FileCheck %s --check-prefixes=CHECK-CACHE // CHECK-BUILD-NOT: piProgramCreateWithBinary( // CHECK-BUILD: piProgramCreate( diff --git a/SYCL/SpecConstants/2020/host_apis.cpp b/SYCL/SpecConstants/2020/host_apis.cpp index 7fb4be4181..c8fd72ae39 100644 --- a/SYCL/SpecConstants/2020/host_apis.cpp +++ b/SYCL/SpecConstants/2020/host_apis.cpp @@ -4,7 +4,6 @@ // UNSUPPORTED: cuda // UNSUPPORTED: hip -// UNSUPPORTED: esimd_emulator #include From c8bf28ddb89b80120fd5bfec739cda351542030f Mon Sep 17 00:00:00 2001 From: vladimirlaz Date: Mon, 17 Jan 2022 09:27:26 +0300 Subject: [PATCH 5/6] Make CPU_RUN_* placeholder respect target BE --- SYCL/lit.cfg.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SYCL/lit.cfg.py b/SYCL/lit.cfg.py index 1cc543fa53..893c829a91 100644 --- a/SYCL/lit.cfg.py +++ b/SYCL/lit.cfg.py @@ -273,11 +273,11 @@ if 'cpu' in config.target_devices.split(','): found_at_least_one_device = True lit_config.note("Test CPU device") - cpu_run_substitute = "env SYCL_DEVICE_FILTER=cpu,host " + cpu_run_substitute = "env SYCL_DEVICE_FILTER={SYCL_PLUGIN}:cpu,host ".format(SYCL_PLUGIN=config.sycl_be) cpu_check_substitute = "| FileCheck %s" config.available_features.add('cpu') if platform.system() == "Linux": - cpu_run_on_linux_substitute = "env SYCL_DEVICE_FILTER=cpu,host " + cpu_run_on_linux_substitute = cpu_run_substitute cpu_check_on_linux_substitute = "| FileCheck %s" else: lit_config.warning("CPU device not used") From 7dabd8511e00cf38adecf24e6e196f5d792bfaed Mon Sep 17 00:00:00 2001 From: vladimirlaz Date: Mon, 17 Jan 2022 09:30:12 +0300 Subject: [PATCH 6/6] Make the test respect target BE --- SYCL/SpecConstants/2020/host_apis.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SYCL/SpecConstants/2020/host_apis.cpp b/SYCL/SpecConstants/2020/host_apis.cpp index c8fd72ae39..7011113ef8 100644 --- a/SYCL/SpecConstants/2020/host_apis.cpp +++ b/SYCL/SpecConstants/2020/host_apis.cpp @@ -1,6 +1,6 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out \ // RUN: -fsycl-dead-args-optimization -// RUN: %t.out +// RUN: %BE_RUN_PLACEHOLDER %t.out // UNSUPPORTED: cuda // UNSUPPORTED: hip