From ba18c360b2f3c25fe9091c7a7931eded374b3cf6 Mon Sep 17 00:00:00 2001 From: Sven van Haastregt Date: Thu, 24 Feb 2022 16:28:52 +0000 Subject: [PATCH] [clang-tidy] Remove opencl-c.h inclusion from tests After D120254 some clang-tidy tests started failing on release builds. clang-tidy has been using the `-fdeclare-opencl-builtins` functionality since this became the default in clang, so there is no need to include `opencl-c.h`. Differential Revision: https://reviews.llvm.org/D120470 --- .../clang-tidy/checkers/altera-id-dependent-backward-branch.cpp | 2 +- .../test/clang-tidy/checkers/altera-single-work-item-barrier.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/clang-tools-extra/test/clang-tidy/checkers/altera-id-dependent-backward-branch.cpp b/clang-tools-extra/test/clang-tidy/checkers/altera-id-dependent-backward-branch.cpp index a6dbab7..68f4658 100644 --- a/clang-tools-extra/test/clang-tidy/checkers/altera-id-dependent-backward-branch.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/altera-id-dependent-backward-branch.cpp @@ -1,4 +1,4 @@ -// RUN: %check_clang_tidy %s altera-id-dependent-backward-branch %t -- -header-filter=.* "--" -cl-std=CL1.2 -c --include opencl-c.h +// RUN: %check_clang_tidy %s altera-id-dependent-backward-branch %t -- -header-filter=.* "--" -cl-std=CL1.2 -c typedef struct ExampleStruct { int IDDepField; diff --git a/clang-tools-extra/test/clang-tidy/checkers/altera-single-work-item-barrier.cpp b/clang-tools-extra/test/clang-tidy/checkers/altera-single-work-item-barrier.cpp index 1b60451..a6b3187 100644 --- a/clang-tools-extra/test/clang-tidy/checkers/altera-single-work-item-barrier.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/altera-single-work-item-barrier.cpp @@ -1,7 +1,7 @@ -// RUN: %check_clang_tidy -check-suffix=OLDCLOLDAOC %s altera-single-work-item-barrier %t -- -header-filter=.* "--" -cl-std=CL1.2 -c --include opencl-c.h -DOLDCLOLDAOC -// RUN: %check_clang_tidy -check-suffix=NEWCLOLDAOC %s altera-single-work-item-barrier %t -- -header-filter=.* "--" -cl-std=CL2.0 -c --include opencl-c.h -DNEWCLOLDAOC -// RUN: %check_clang_tidy -check-suffix=OLDCLNEWAOC %s altera-single-work-item-barrier %t -- -config='{CheckOptions: [{key: altera-single-work-item-barrier.AOCVersion, value: 1701}]}' -header-filter=.* "--" -cl-std=CL1.2 -c --include opencl-c.h -DOLDCLNEWAOC -// RUN: %check_clang_tidy -check-suffix=NEWCLNEWAOC %s altera-single-work-item-barrier %t -- -config='{CheckOptions: [{key: altera-single-work-item-barrier.AOCVersion, value: 1701}]}' -header-filter=.* "--" -cl-std=CL2.0 -c --include opencl-c.h -DNEWCLNEWAOC +// RUN: %check_clang_tidy -check-suffix=OLDCLOLDAOC %s altera-single-work-item-barrier %t -- -header-filter=.* "--" -cl-std=CL1.2 -c -DOLDCLOLDAOC +// RUN: %check_clang_tidy -check-suffix=NEWCLOLDAOC %s altera-single-work-item-barrier %t -- -header-filter=.* "--" -cl-std=CL2.0 -c -DNEWCLOLDAOC +// RUN: %check_clang_tidy -check-suffix=OLDCLNEWAOC %s altera-single-work-item-barrier %t -- -config='{CheckOptions: [{key: altera-single-work-item-barrier.AOCVersion, value: 1701}]}' -header-filter=.* "--" -cl-std=CL1.2 -c -DOLDCLNEWAOC +// RUN: %check_clang_tidy -check-suffix=NEWCLNEWAOC %s altera-single-work-item-barrier %t -- -config='{CheckOptions: [{key: altera-single-work-item-barrier.AOCVersion, value: 1701}]}' -header-filter=.* "--" -cl-std=CL2.0 -c -DNEWCLNEWAOC #ifdef OLDCLOLDAOC // OpenCL 1.2 Altera Offline Compiler < 17.1 void __kernel error_barrier_no_id(__global int * foo, int size) { -- 2.7.4