Skip to content

[CI] Add libclc tests to pre- and post-commit validation #5062

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 2, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/sycl_linux_build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
9 changes: 8 additions & 1 deletion buildbot/configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,17 @@ 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. #")
print("#############################################")

# 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:
Expand All @@ -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'
Expand Down Expand Up @@ -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 = [
Expand Down
2 changes: 0 additions & 2 deletions libclc/test/binding/ocl/acos.cl
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@

// RUN: %clang -emit-llvm -S -o - %s | FileCheck %s

// XFAIL: amdgcn

#include <spirv/spirv_types.h>

// CHECK-NOT: declare {{.*}} @_Z
Expand Down
2 changes: 0 additions & 2 deletions libclc/test/binding/ocl/asin.cl
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@

// RUN: %clang -emit-llvm -S -o - %s | FileCheck %s

// XFAIL: amdgcn

#include <spirv/spirv_types.h>

// CHECK-NOT: declare {{.*}} @_Z
Expand Down
2 changes: 0 additions & 2 deletions libclc/test/binding/ocl/cos.cl
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@

// RUN: %clang -emit-llvm -S -o - %s | FileCheck %s

// XFAIL: amdgcn

#include <spirv/spirv_types.h>

// CHECK-NOT: declare {{.*}} @_Z
Expand Down
2 changes: 0 additions & 2 deletions libclc/test/binding/ocl/sin.cl
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@

// RUN: %clang -emit-llvm -S -o - %s | FileCheck %s

// XFAIL: amdgcn

#include <spirv/spirv_types.h>

// CHECK-NOT: declare {{.*}} @_Z
Expand Down
2 changes: 0 additions & 2 deletions libclc/test/binding/ocl/sincos.cl
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@

// RUN: %clang -emit-llvm -S -o - %s | FileCheck %s

// XFAIL: amdgcn

#include <spirv/spirv_types.h>

// CHECK-NOT: declare {{.*}} @_Z
Expand Down
2 changes: 0 additions & 2 deletions libclc/test/binding/ocl/sqrt.cl
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@

// RUN: %clang -emit-llvm -S -o - %s | FileCheck %s

// XFAIL: amdgcn

#include <spirv/spirv_types.h>

// CHECK-NOT: declare {{.*}} @_Z
Expand Down