From 14249cc5d8aa2055d07d30ede387cf7cb6a68295 Mon Sep 17 00:00:00 2001 From: Alexey Bader Date: Tue, 25 Aug 2020 17:57:08 +0300 Subject: [PATCH 1/3] [SYCL][NFC] Remove workaround for SPIR-V translator issues Latest pulldown from SPIR-V translator enabled regular execution of several LIT tests. --- sycl/test/basic_tests/accessor/accessor.cpp | 5 +---- sycl/test/basic_tests/boolean.cpp | 5 +---- sycl/test/fpga_tests/fpga_lsu.cpp | 5 +---- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/sycl/test/basic_tests/accessor/accessor.cpp b/sycl/test/basic_tests/accessor/accessor.cpp index 8ce78c67a1966..413ed9ddd0c13 100644 --- a/sycl/test/basic_tests/accessor/accessor.cpp +++ b/sycl/test/basic_tests/accessor/accessor.cpp @@ -1,7 +1,4 @@ -// TODO: Enable compilation w/o -fno-sycl-early-optimizations option. -// See https://github.com/intel/llvm/issues/2264 for more details. - -// RUN: %clangxx -fsycl -fno-sycl-early-optimizations -fsycl-targets=%sycl_triple %s -o %t.out +// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // RUN: env SYCL_DEVICE_TYPE=HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/sycl/test/basic_tests/boolean.cpp b/sycl/test/basic_tests/boolean.cpp index dec4aec312ed7..cac65ddaa80bd 100644 --- a/sycl/test/basic_tests/boolean.cpp +++ b/sycl/test/basic_tests/boolean.cpp @@ -1,7 +1,4 @@ -// TODO: Enable compilation w/o -fno-sycl-early-optimizations option. -// See https://github.com/intel/llvm/issues/2264 for more details. - -// RUN: %clangxx -fsycl -fno-sycl-early-optimizations -fsycl-targets=%sycl_triple %s -o %t.out +// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // RUN: env SYCL_DEVICE_TYPE=HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/sycl/test/fpga_tests/fpga_lsu.cpp b/sycl/test/fpga_tests/fpga_lsu.cpp index ffdc1d92bf954..8acb73199f02b 100644 --- a/sycl/test/fpga_tests/fpga_lsu.cpp +++ b/sycl/test/fpga_tests/fpga_lsu.cpp @@ -1,7 +1,4 @@ -// TODO: Enable compilation w/o -fno-sycl-early-optimizations option. -// See https://github.com/intel/llvm/issues/2264 for more details. - -// RUN: %clangxx -fsycl -fno-sycl-early-optimizations %s -o %t.out +// RUN: %clangxx -fsycl %s -o %t.out // RUNx: %ACC_RUN_PLACEHOLDER %t.out //==----------------- fpga_lsu.cpp - SYCL FPGA LSU test --------------------==// // From 301404adfef3bc8cfca4f1052ed9214fa7b11ecb Mon Sep 17 00:00:00 2001 From: Alexey Bader Date: Tue, 25 Aug 2020 18:52:26 +0300 Subject: [PATCH 2/3] Update sycl/test/basic_tests/boolean.cpp Let's check if this test fails on GPU only --- sycl/test/basic_tests/boolean.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sycl/test/basic_tests/boolean.cpp b/sycl/test/basic_tests/boolean.cpp index cac65ddaa80bd..d3808ba389982 100644 --- a/sycl/test/basic_tests/boolean.cpp +++ b/sycl/test/basic_tests/boolean.cpp @@ -1,7 +1,7 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // RUN: env SYCL_DEVICE_TYPE=HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out +// RUNx: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out #include From f520d774ae5978f38537b960d7d3076249419861 Mon Sep 17 00:00:00 2001 From: Alexey Bader Date: Tue, 25 Aug 2020 19:34:45 +0300 Subject: [PATCH 3/3] Reapply the workaround to accessor and boolean tests. It requires new low-level runtimes. --- sycl/test/basic_tests/accessor/accessor.cpp | 5 ++++- sycl/test/basic_tests/boolean.cpp | 7 +++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/sycl/test/basic_tests/accessor/accessor.cpp b/sycl/test/basic_tests/accessor/accessor.cpp index 413ed9ddd0c13..8ce78c67a1966 100644 --- a/sycl/test/basic_tests/accessor/accessor.cpp +++ b/sycl/test/basic_tests/accessor/accessor.cpp @@ -1,4 +1,7 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out +// TODO: Enable compilation w/o -fno-sycl-early-optimizations option. +// See https://github.com/intel/llvm/issues/2264 for more details. + +// RUN: %clangxx -fsycl -fno-sycl-early-optimizations -fsycl-targets=%sycl_triple %s -o %t.out // RUN: env SYCL_DEVICE_TYPE=HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/sycl/test/basic_tests/boolean.cpp b/sycl/test/basic_tests/boolean.cpp index d3808ba389982..dec4aec312ed7 100644 --- a/sycl/test/basic_tests/boolean.cpp +++ b/sycl/test/basic_tests/boolean.cpp @@ -1,7 +1,10 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out +// TODO: Enable compilation w/o -fno-sycl-early-optimizations option. +// See https://github.com/intel/llvm/issues/2264 for more details. + +// RUN: %clangxx -fsycl -fno-sycl-early-optimizations -fsycl-targets=%sycl_triple %s -o %t.out // RUN: env SYCL_DEVICE_TYPE=HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUNx: %GPU_RUN_PLACEHOLDER %t.out +// RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out #include