Author: Alexander Kornienko Date: 2020-04-13T06:19:09+02:00 New Revision: 8dda0f91995955bb8f484f8d41374aff59118355
URL: https://github.com/llvm/llvm-project/commit/8dda0f91995955bb8f484f8d41374aff59118355 DIFF: https://github.com/llvm/llvm-project/commit/8dda0f91995955bb8f484f8d41374aff59118355.diff LOG: Remove dependency between test files. There seems to be no good reason for rocm-device-libs.cl to depend on opencl.cl. Removed this dependency to unbreak the tests in our setup. Added: Modified: clang/test/Driver/rocm-device-libs.cl Removed: ################################################################################ diff --git a/clang/test/Driver/rocm-device-libs.cl b/clang/test/Driver/rocm-device-libs.cl index 77e9782f2594..a5e9e6496c45 100644 --- a/clang/test/Driver/rocm-device-libs.cl +++ b/clang/test/Driver/rocm-device-libs.cl @@ -7,7 +7,7 @@ // RUN: %clang -### -target amdgcn-amd-amdhsa \ // RUN: -x cl -mcpu=gfx900 \ // RUN: --rocm-path=%S/Inputs/rocm-device-libs \ -// RUN: %S/opencl.cl \ +// RUN: %s \ // RUN: 2>&1 | FileCheck -dump-input-on-failure --check-prefixes=COMMON,COMMON-DEFAULT,GFX900-DEFAULT,GFX900,WAVE64 %s @@ -16,7 +16,7 @@ // RUN: %clang -### -target amdgcn-amd-amdhsa \ // RUN: -x cl -mcpu=gfx803 \ // RUN: --rocm-path=%S/Inputs/rocm-device-libs \ -// RUN: %S/opencl.cl \ +// RUN: %s \ // RUN: 2>&1 | FileCheck -dump-input-on-failure --check-prefixes=COMMON,COMMON-DEFAULT,GFX803-DEFAULT,GFX803,WAVE64 %s @@ -25,7 +25,7 @@ // RUN: %clang -### -target amdgcn-amd-amdhsa \ // RUN: -x cl -mcpu=fiji \ // RUN: --rocm-path=%S/Inputs/rocm-device-libs \ -// RUN: %S/opencl.cl \ +// RUN: %s \ // RUN: 2>&1 | FileCheck -dump-input-on-failure --check-prefixes=COMMON,COMMON-DEFAULT,GFX803-DEFAULT,GFX803,WAVE64 %s @@ -34,7 +34,7 @@ // RUN: -x cl -mcpu=gfx900 \ // RUN: -cl-denorms-are-zero \ // RUN: --rocm-path=%S/Inputs/rocm-device-libs \ -// RUN: %S/opencl.cl \ +// RUN: %s \ // RUN: 2>&1 | FileCheck -dump-input-on-failure --check-prefixes=COMMON,COMMON-DAZ,GFX900,WAVE64 %s @@ -42,7 +42,7 @@ // RUN: -x cl -mcpu=gfx803 \ // RUN: -cl-denorms-are-zero \ // RUN: --rocm-path=%S/Inputs/rocm-device-libs \ -// RUN: %S/opencl.cl \ +// RUN: %s \ // RUN: 2>&1 | FileCheck -dump-input-on-failure --check-prefixes=COMMON,COMMON-DAZ,GFX803,WAVE64 %s @@ -51,7 +51,7 @@ // RUN: -x cl -mcpu=gfx803 \ // RUN: -cl-finite-math-only \ // RUN: --rocm-path=%S/Inputs/rocm-device-libs \ -// RUN: %S/opencl.cl \ +// RUN: %s \ // RUN: 2>&1 | FileCheck -dump-input-on-failure --check-prefixes=COMMON,COMMON-FINITE-ONLY,GFX803,WAVE64 %s @@ -60,7 +60,7 @@ // RUN: -x cl -mcpu=gfx803 \ // RUN: -cl-fp32-correctly-rounded-divide-sqrt \ // RUN: --rocm-path=%S/Inputs/rocm-device-libs \ -// RUN: %S/opencl.cl \ +// RUN: %s \ // RUN: 2>&1 | FileCheck -dump-input-on-failure --check-prefixes=COMMON,COMMON-CORRECT-SQRT,GFX803,WAVE64 %s @@ -69,7 +69,7 @@ // RUN: -x cl -mcpu=gfx803 \ // RUN: -cl-fast-relaxed-math \ // RUN: --rocm-path=%S/Inputs/rocm-device-libs \ -// RUN: %S/opencl.cl \ +// RUN: %s \ // RUN: 2>&1 | FileCheck -dump-input-on-failure --check-prefixes=COMMON,COMMON-FAST-RELAXED,GFX803,WAVE64 %s @@ -78,45 +78,45 @@ // RUN: -x cl -mcpu=gfx803 \ // RUN: -cl-unsafe-math-optimizations \ // RUN: --rocm-path=%S/Inputs/rocm-device-libs \ -// RUN: %S/opencl.cl \ +// RUN: %s \ // RUN: 2>&1 | FileCheck -dump-input-on-failure --check-prefixes=COMMON,COMMON-UNSAFE,GFX803,WAVE64 %s // RUN: %clang -### -target amdgcn-amd-amdhsa \ // RUN: -x cl -mcpu=gfx1010 \ // RUN: --rocm-path=%S/Inputs/rocm-device-libs \ -// RUN: %S/opencl.cl \ +// RUN: %s \ // RUN: 2>&1 | FileCheck -dump-input-on-failure --check-prefixes=COMMMON,GFX1010,WAVE32 %s // RUN: %clang -### -target amdgcn-amd-amdhsa \ // RUN: -x cl -mcpu=gfx1011 \ // RUN: --rocm-path=%S/Inputs/rocm-device-libs \ -// RUN: %S/opencl.cl \ +// RUN: %s \ // RUN: 2>&1 | FileCheck -dump-input-on-failure --check-prefixes=COMMMON,GFX1011,WAVE32 %s // RUN: %clang -### -target amdgcn-amd-amdhsa \ // RUN: -x cl -mcpu=gfx1012 \ // RUN: --rocm-path=%S/Inputs/rocm-device-libs \ -// RUN: %S/opencl.cl \ +// RUN: %s \ // RUN: 2>&1 | FileCheck -dump-input-on-failure --check-prefixes=COMMMON,GFX1012,WAVE32 %s // RUN: %clang -### -target amdgcn-amd-amdhsa \ // RUN: -x cl -mcpu=gfx1010 -mwavefrontsize64 \ // RUN: --rocm-path=%S/Inputs/rocm-device-libs \ -// RUN: %S/opencl.cl \ +// RUN: %s \ // RUN: 2>&1 | FileCheck -dump-input-on-failure --check-prefixes=COMMMON,GFX1010,WAVE64 %s // RUN: %clang -### -target amdgcn-amd-amdhsa \ // RUN: -x cl -mcpu=gfx1010 -mwavefrontsize64 -mno-wavefrontsize64 \ // RUN: --rocm-path=%S/Inputs/rocm-device-libs \ -// RUN: %S/opencl.cl \ +// RUN: %s \ // RUN: 2>&1 | FileCheck -dump-input-on-failure --check-prefixes=COMMMON,GFX1010,WAVE32 %s // Ignore -mno-wavefrontsize64 without wave32 support // RUN: %clang -### -target amdgcn-amd-amdhsa \ // RUN: -x cl -mcpu=gfx803 -mno-wavefrontsize64 \ // RUN: --rocm-path=%S/Inputs/rocm-device-libs \ -// RUN: %S/opencl.cl \ +// RUN: %s \ // RUN: 2>&1 | FileCheck -dump-input-on-failure --check-prefixes=COMMMON,GFX803,WAVE64 %s @@ -162,3 +162,5 @@ // GFX900: "-mlink-builtin-bitcode" "{{.*}}/lib/oclc_isa_version_900.amdgcn.bc" // GFX803: "-mlink-builtin-bitcode" "{{.*}}/lib/oclc_isa_version_803.amdgcn.bc" + +kernel void func(void); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
