diff --git a/.github/workflows/sycl_linux_build_and_test.yml b/.github/workflows/sycl_linux_build_and_test.yml index e4426abfe78eb..5648d9d532e09 100644 --- a/.github/workflows/sycl_linux_build_and_test.yml +++ b/.github/workflows/sycl_linux_build_and_test.yml @@ -137,6 +137,10 @@ jobs: if: always() run: | cmake --build $GITHUB_WORKSPACE/build --target check-xptifw + - name: check-libclc + if: always() + run: | + cmake --build $GITHUB_WORKSPACE/build --target check-libclc - name: Install # TODO replace utility installation with a single CMake target run: | diff --git a/buildbot/configure.py b/buildbot/configure.py index e30b5e860c9db..a87fcea367867 100644 --- a/buildbot/configure.py +++ b/buildbot/configure.py @@ -43,6 +43,8 @@ def do_configure(args): sycl_enable_xpti_tracing = 'ON' xpti_enable_werror = 'ON' + build_libclc = False + if args.ci_defaults: print("#############################################") print("# Default CI configuration will be applied. #") @@ -50,6 +52,8 @@ def do_configure(args): # For clang-format and clang-tidy llvm_enable_projects += ";clang-tools-extra" + # libclc is required for CI validation + build_libclc = True # replace not append, so ARM ^ X86 if args.arm: @@ -59,7 +63,7 @@ def do_configure(args): sycl_build_pi_esimd_emulator = 'ON' if args.cuda or args.hip: - llvm_enable_projects += ';libclc' + build_libclc = True if args.cuda: llvm_targets_to_build += ';NVPTX' @@ -101,6 +105,9 @@ def do_configure(args): if args.use_lld: llvm_enable_lld = 'ON' + if build_libclc: + llvm_enable_projects += ';libclc' + install_dir = os.path.join(abs_obj_dir, "install") cmake_cmd = [ diff --git a/libclc/test/binding/ocl/acos.cl b/libclc/test/binding/ocl/acos.cl index 371dd30602dc6..211bf56d5f9c8 100644 --- a/libclc/test/binding/ocl/acos.cl +++ b/libclc/test/binding/ocl/acos.cl @@ -11,8 +11,6 @@ // RUN: %clang -emit-llvm -S -o - %s | FileCheck %s -// XFAIL: amdgcn - #include // CHECK-NOT: declare {{.*}} @_Z diff --git a/libclc/test/binding/ocl/asin.cl b/libclc/test/binding/ocl/asin.cl index 568c4c7a8f63d..fea4361926387 100644 --- a/libclc/test/binding/ocl/asin.cl +++ b/libclc/test/binding/ocl/asin.cl @@ -11,8 +11,6 @@ // RUN: %clang -emit-llvm -S -o - %s | FileCheck %s -// XFAIL: amdgcn - #include // CHECK-NOT: declare {{.*}} @_Z diff --git a/libclc/test/binding/ocl/cos.cl b/libclc/test/binding/ocl/cos.cl index 5c0de3c0f8be2..7f9a884f989a7 100644 --- a/libclc/test/binding/ocl/cos.cl +++ b/libclc/test/binding/ocl/cos.cl @@ -11,8 +11,6 @@ // RUN: %clang -emit-llvm -S -o - %s | FileCheck %s -// XFAIL: amdgcn - #include // CHECK-NOT: declare {{.*}} @_Z diff --git a/libclc/test/binding/ocl/sin.cl b/libclc/test/binding/ocl/sin.cl index 58ba5634fbf71..a072b5922bb41 100644 --- a/libclc/test/binding/ocl/sin.cl +++ b/libclc/test/binding/ocl/sin.cl @@ -11,8 +11,6 @@ // RUN: %clang -emit-llvm -S -o - %s | FileCheck %s -// XFAIL: amdgcn - #include // CHECK-NOT: declare {{.*}} @_Z diff --git a/libclc/test/binding/ocl/sincos.cl b/libclc/test/binding/ocl/sincos.cl index a7a6873435a39..46c0eebe1f5f8 100644 --- a/libclc/test/binding/ocl/sincos.cl +++ b/libclc/test/binding/ocl/sincos.cl @@ -11,8 +11,6 @@ // RUN: %clang -emit-llvm -S -o - %s | FileCheck %s -// XFAIL: amdgcn - #include // CHECK-NOT: declare {{.*}} @_Z diff --git a/libclc/test/binding/ocl/sqrt.cl b/libclc/test/binding/ocl/sqrt.cl index 97c15a430d50f..4e7b061e57f3c 100644 --- a/libclc/test/binding/ocl/sqrt.cl +++ b/libclc/test/binding/ocl/sqrt.cl @@ -11,8 +11,6 @@ // RUN: %clang -emit-llvm -S -o - %s | FileCheck %s -// XFAIL: amdgcn - #include // CHECK-NOT: declare {{.*}} @_Z