Remove new usages of -sycldevice triple compoenent.

bader · bader · commit f36870864840 · 2021-09-01T12:33:42.000+03:00
diff --git a/clang/test/CodeGenSYCL/nvptx-printf.cpp b/clang/test/CodeGenSYCL/nvptx-printf.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fsycl-is-device -triple nvptx64-nvidia-cuda-sycldevice -std=c++11 -S -emit-llvm -x c++ %s -o - | FileCheck %s
+// RUN: %clang_cc1 -fsycl-is-device -triple nvptx64-nvidia-cuda -std=c++11 -S -emit-llvm -x c++ %s -o - | FileCheck %s
 
 #include "Inputs/sycl.hpp"
 
diff --git a/clang/test/CodeGenSYCL/unique_unnamed_kernels.cpp b/clang/test/CodeGenSYCL/unique_unnamed_kernels.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fsycl-is-device -triple spir64-sycldevice -IInputs -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang_cc1 -fsycl-is-device -triple spir64 -IInputs -emit-llvm %s -o - | FileCheck %s
 // This test ensures that we don't generate a kernel before we have instantiated
 // all the kernel declarations, which can change the name of a kernel in the
 // unnamed kernel case. Previously we would have duplicate manglings of the
diff --git a/clang/test/Driver/sycl-int-footer.cpp b/clang/test/Driver/sycl-int-footer.cpp
@@ -86,10 +86,10 @@
 // DEP_GEN_PHASES: 2: input, "[[INPUTFILE]]", c++, (device-sycl)
 // DEP_GEN_PHASES: 3: preprocessor, {2}, c++-cpp-output, (device-sycl)
 // DEP_GEN_PHASES: 4: compiler, {3}, ir, (device-sycl)
-// DEP_GEN_PHASES: 5: offload, "device-sycl (spir64-unknown-unknown-sycldevice)" {4}, ir
+// DEP_GEN_PHASES: 5: offload, "device-sycl (spir64-unknown-unknown)" {4}, ir
 // DEP_GEN_PHASES: 6: append-footer, {0}, c++, (host-sycl)
 // DEP_GEN_PHASES: 7: preprocessor, {6}, c++-cpp-output, (host-sycl)
-// DEP_GEN_PHASES: 8: offload, "host-sycl (x86_64-unknown-linux-gnu)" {7}, "device-sycl (spir64-unknown-unknown-sycldevice)" {4}, c++-cpp-output
+// DEP_GEN_PHASES: 8: offload, "host-sycl (x86_64-unknown-linux-gnu)" {7}, "device-sycl (spir64-unknown-unknown)" {4}, c++-cpp-output
 // DEP_GEN_PHASES: 9: compiler, {8}, ir, (host-sycl)
 // DEP_GEN_PHASES: 10: backend, {9}, assembler, (host-sycl)
 // DEP_GEN_PHASES: 11: assembler, {10}, object, (host-sycl)
diff --git a/llvm-spirv/test/lower-non-standard-types.ll b/llvm-spirv/test/lower-non-standard-types.ll
@@ -15,7 +15,7 @@
 ; ModuleID = 'lower-non-standard-types'
 source_filename = "lower-non-standard-types.cpp"
 target datalayout = "e-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-n8:16:32:64"
-target triple = "spir64-unknown-unknown-sycldevice"
+target triple = "spir64-unknown-unknown"
 
 @Id = external dso_local local_unnamed_addr addrspace(1) constant <3 x i64>, align 32
 
diff --git a/llvm-spirv/test/lower-non-standard-vec-with-ext.ll b/llvm-spirv/test/lower-non-standard-vec-with-ext.ll
@@ -4,7 +4,7 @@
 
 ; ModuleID = 'lower-non-standard-vec-with-ext'
 target datalayout = "e-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-n8:16:32:64"
-target triple = "spir64-unknown-unknown-sycldevice"
+target triple = "spir64-unknown-unknown"
 
 @Id = external dso_local local_unnamed_addr addrspace(1) constant <3 x i64>, align 32
 
diff --git a/sycl/doc/GetStartedGuide.md b/sycl/doc/GetStartedGuide.md
@@ -425,7 +425,7 @@ If CUDA support has been built, it is tested only if there are CUDA devices
 available.
 
 If testing with ROCm for AMD make sure to specify the GPU being used
-by adding `-Xsycl-target-backend=amdgcn-amd-amdhsa-sycldevice
+by adding `-Xsycl-target-backend=amdgcn-amd-amdhsa
 --offload-arch=<target>` to the CMake variable
 `SYCL_CLANG_EXTRA_FLAGS`.
 
diff --git a/sycl/test/CMakeLists.txt b/sycl/test/CMakeLists.txt
@@ -83,7 +83,7 @@ if(SYCL_BUILD_PI_ROCM)
     add_lit_testsuite(check-sycl-rocm-ptx "Running device-agnostic SYCL regression tests for ROCm NVidia PTX"
       ${CMAKE_CURRENT_BINARY_DIR}
       ARGS ${RT_TEST_ARGS}
-      PARAMS "SYCL_TRIPLE=nvptx64-nvidia-cuda-sycldevice;SYCL_PLUGIN=rocm"
+      PARAMS "SYCL_TRIPLE=nvptx64-nvidia-cuda;SYCL_PLUGIN=rocm"
       DEPENDS ${SYCL_TEST_DEPS}
       EXCLUDE_FROM_CHECK_ALL
     )
@@ -93,7 +93,7 @@ if(SYCL_BUILD_PI_ROCM)
     add_lit_testsuite(check-sycl-rocm-gcn "Running device-agnostic SYCL regression tests for ROCm AMDGCN"
       ${CMAKE_CURRENT_BINARY_DIR}
       ARGS ${RT_TEST_ARGS}
-      PARAMS "SYCL_TRIPLE=amdgcn-amd-amdhsa-sycldevice;SYCL_PLUGIN=rocm"
+      PARAMS "SYCL_TRIPLE=amdgcn-amd-amdhsa;SYCL_PLUGIN=rocm"
       DEPENDS ${SYCL_TEST_DEPS}
       EXCLUDE_FROM_CHECK_ALL
     )
diff --git a/sycl/test/lit.cfg.py b/sycl/test/lit.cfg.py
@@ -103,13 +103,13 @@
 if triple == 'nvptx64-nvidia-cuda':
     config.available_features.add('cuda')
 
-if triple == 'amdgcn-amd-amdhsa-sycldevice':
+if triple == 'amdgcn-amd-amdhsa':
     config.available_features.add('rocm_amd')
     # For AMD the specific GPU has to be specified with --offload-arch
     if not re.match('.*--offload-arch.*', config.sycl_clang_extra_flags):
         raise Exception("Error: missing --offload-arch flag when trying to "  \
                         "run lit tests for AMD GPU, please add "              \
-                        "`-Xsycl-target-backend=amdgcn-amd-amdhsa-sycldevice --offload-arch=<target>` to " \
+                        "`-Xsycl-target-backend=amdgcn-amd-amdhsa --offload-arch=<target>` to " \
                         "the CMake variable SYCL_CLANG_EXTRA_FLAGS")
 
 # Set timeout for test = 10 mins

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %clang_cc1 -fsycl-is-device -triple nvptx64-nvidia-cuda-sycldevice -std=c++11 -S -emit-llvm -x c++ %s -o - \| FileCheck %s`
	`1`	`+// RUN: %clang_cc1 -fsycl-is-device -triple nvptx64-nvidia-cuda -std=c++11 -S -emit-llvm -x c++ %s -o - \| FileCheck %s`
`2`	`2`
`3`	`3`	`#include "Inputs/sycl.hpp"`
`4`	`4`