Author: tra Date: Tue Aug 2 18:43:04 2016 New Revision: 277552 URL: http://llvm.org/viewvc/llvm-project?rev=277552&view=rev Log: [CUDA] Updated CUDA tests that must run w/o CUDA installation.
Fixes test failures after r277542 on systems that don't have CUDA installed. Modified: cfe/trunk/test/Driver/cuda-simple.cu cfe/trunk/test/Preprocessor/cuda-approx-transcendentals.cu cfe/trunk/test/Preprocessor/cuda-preprocess.cu cfe/trunk/test/Preprocessor/cuda-types.cu Modified: cfe/trunk/test/Driver/cuda-simple.cu URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/cuda-simple.cu?rev=277552&r1=277551&r2=277552&view=diff ============================================================================== --- cfe/trunk/test/Driver/cuda-simple.cu (original) +++ cfe/trunk/test/Driver/cuda-simple.cu Tue Aug 2 18:43:04 2016 @@ -1,6 +1,6 @@ // Verify that we can parse a simple CUDA file with or without -save-temps // http://llvm.org/PR22936 -// RUN: %clang -nocudainc -Werror -fsyntax-only -c %s +// RUN: %clang -nocudainc -nocudalib -Werror -fsyntax-only -c %s // // Verify that we pass -x cuda-cpp-output to compiler after // preprocessing a CUDA file Modified: cfe/trunk/test/Preprocessor/cuda-approx-transcendentals.cu URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Preprocessor/cuda-approx-transcendentals.cu?rev=277552&r1=277551&r2=277552&view=diff ============================================================================== --- cfe/trunk/test/Preprocessor/cuda-approx-transcendentals.cu (original) +++ cfe/trunk/test/Preprocessor/cuda-approx-transcendentals.cu Tue Aug 2 18:43:04 2016 @@ -1,7 +1,7 @@ // RUN: %clang --cuda-host-only -nocudainc -target i386-unknown-linux-gnu -x cuda -E -dM -o - /dev/null | FileCheck --check-prefix HOST %s -// RUN: %clang --cuda-device-only -nocudainc -target i386-unknown-linux-gnu -x cuda -E -dM -o - /dev/null | FileCheck --check-prefix DEVICE-NOFAST %s -// RUN: %clang -fcuda-approx-transcendentals --cuda-device-only -nocudainc -target i386-unknown-linux-gnu -x cuda -E -dM -o - /dev/null | FileCheck --check-prefix DEVICE-FAST %s -// RUN: %clang -ffast-math --cuda-device-only -nocudainc -target i386-unknown-linux-gnu -x cuda -E -dM -o - /dev/null | FileCheck --check-prefix DEVICE-FAST %s +// RUN: %clang --cuda-device-only -nocudainc -nocudalib -target i386-unknown-linux-gnu -x cuda -E -dM -o - /dev/null | FileCheck --check-prefix DEVICE-NOFAST %s +// RUN: %clang -fcuda-approx-transcendentals --cuda-device-only -nocudainc -nocudalib -target i386-unknown-linux-gnu -x cuda -E -dM -o - /dev/null | FileCheck --check-prefix DEVICE-FAST %s +// RUN: %clang -ffast-math --cuda-device-only -nocudainc -nocudalib -target i386-unknown-linux-gnu -x cuda -E -dM -o - /dev/null | FileCheck --check-prefix DEVICE-FAST %s // HOST-NOT: __CLANG_CUDA_APPROX_TRANSCENDENTALS__ // DEVICE-NOFAST-NOT: __CLANG_CUDA_APPROX_TRANSCENDENTALS__ Modified: cfe/trunk/test/Preprocessor/cuda-preprocess.cu URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Preprocessor/cuda-preprocess.cu?rev=277552&r1=277551&r2=277552&view=diff ============================================================================== --- cfe/trunk/test/Preprocessor/cuda-preprocess.cu (original) +++ cfe/trunk/test/Preprocessor/cuda-preprocess.cu Tue Aug 2 18:43:04 2016 @@ -13,20 +13,20 @@ clang_unittest_cuda_arch __CUDA_ARCH__ // CHECK-NOT: PREPROCESSED_AWAY -// RUN: %clang -E -target x86_64-linux-gnu --cuda-gpu-arch=sm_20 -nocudainc %s 2>&1 \ +// RUN: %clang -E -target x86_64-linux-gnu --cuda-gpu-arch=sm_20 -nocudainc -nocudalib %s 2>&1 \ // RUN: | FileCheck -check-prefix NOARCH %s // RUN: %clang -E -target x86_64-linux-gnu --cuda-gpu-arch=sm_20 --cuda-host-only -nocudainc %s 2>&1 \ // RUN: | FileCheck -check-prefix NOARCH %s // NOARCH: clang_unittest_no_arch -// RUN: %clang -E -target x86_64-linux-gnu --cuda-gpu-arch=sm_20 --cuda-device-only -nocudainc %s 2>&1 \ +// RUN: %clang -E -target x86_64-linux-gnu --cuda-gpu-arch=sm_20 --cuda-device-only -nocudainc -nocudalib %s 2>&1 \ // RUN: | FileCheck -check-prefix SM20 %s // SM20: clang_unittest_cuda_arch 200 -// RUN: %clang -E -target x86_64-linux-gnu --cuda-gpu-arch=sm_30 --cuda-device-only -nocudainc %s 2>&1 \ +// RUN: %clang -E -target x86_64-linux-gnu --cuda-gpu-arch=sm_30 --cuda-device-only -nocudainc -nocudalib %s 2>&1 \ // RUN: | FileCheck -check-prefix SM30 %s // SM30: clang_unittest_cuda_arch 300 // RUN: %clang -E -target x86_64-linux-gnu --cuda-gpu-arch=sm_20 --cuda-gpu-arch=sm_30 \ -// RUN: --cuda-device-only -nocudainc %s 2>&1 \ +// RUN: --cuda-device-only -nocudainc -nocudalib %s 2>&1 \ // RUN: | FileCheck -check-prefix SM20 -check-prefix SM30 %s Modified: cfe/trunk/test/Preprocessor/cuda-types.cu URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Preprocessor/cuda-types.cu?rev=277552&r1=277551&r2=277552&view=diff ============================================================================== --- cfe/trunk/test/Preprocessor/cuda-types.cu (original) +++ cfe/trunk/test/Preprocessor/cuda-types.cu Tue Aug 2 18:43:04 2016 @@ -3,19 +3,19 @@ // different on host and device. // RUN: %clang --cuda-host-only -nocudainc -target i386-unknown-linux-gnu -x cuda -E -dM -o - /dev/null > %T/i386-host-defines -// RUN: %clang --cuda-device-only -nocudainc -target i386-unknown-linux-gnu -x cuda -E -dM -o - /dev/null > %T/i386-device-defines +// RUN: %clang --cuda-device-only -nocudainc -nocudalib -target i386-unknown-linux-gnu -x cuda -E -dM -o - /dev/null > %T/i386-device-defines // RUN: grep 'define __[^ ]*\(TYPE\|MAX\|SIZEOF|WIDTH\)' %T/i386-host-defines | grep -v '__LDBL\|_LONG_DOUBLE' > %T/i386-host-defines-filtered // RUN: grep 'define __[^ ]*\(TYPE\|MAX\|SIZEOF|WIDTH\)' %T/i386-device-defines | grep -v '__LDBL\|_LONG_DOUBLE' > %T/i386-device-defines-filtered // RUN: diff %T/i386-host-defines-filtered %T/i386-device-defines-filtered // RUN: %clang --cuda-host-only -nocudainc -target x86_64-unknown-linux-gnu -x cuda -E -dM -o - /dev/null > %T/x86_64-host-defines -// RUN: %clang --cuda-device-only -nocudainc -target x86_64-unknown-linux-gnu -x cuda -E -dM -o - /dev/null > %T/x86_64-device-defines +// RUN: %clang --cuda-device-only -nocudainc -nocudalib -target x86_64-unknown-linux-gnu -x cuda -E -dM -o - /dev/null > %T/x86_64-device-defines // RUN: grep 'define __[^ ]*\(TYPE\|MAX\|SIZEOF\|WIDTH\)' %T/x86_64-host-defines | grep -v '__LDBL\|_LONG_DOUBLE' > %T/x86_64-host-defines-filtered // RUN: grep 'define __[^ ]*\(TYPE\|MAX\|SIZEOF\|WIDTH\)' %T/x86_64-device-defines | grep -v '__LDBL\|_LONG_DOUBLE' > %T/x86_64-device-defines-filtered // RUN: diff %T/x86_64-host-defines-filtered %T/x86_64-device-defines-filtered // RUN: %clang --cuda-host-only -nocudainc -target powerpc64-unknown-linux-gnu -x cuda -E -dM -o - /dev/null > %T/powerpc64-host-defines -// RUN: %clang --cuda-device-only -nocudainc -target powerpc64-unknown-linux-gnu -x cuda -E -dM -o - /dev/null > %T/powerpc64-device-defines +// RUN: %clang --cuda-device-only -nocudainc -nocudalib -target powerpc64-unknown-linux-gnu -x cuda -E -dM -o - /dev/null > %T/powerpc64-device-defines // RUN: grep 'define __[^ ]*\(TYPE\|MAX\|SIZEOF\|WIDTH\)' %T/powerpc64-host-defines | grep -v '__LDBL\|_LONG_DOUBLE' > %T/powerpc64-host-defines-filtered // RUN: grep 'define __[^ ]*\(TYPE\|MAX\|SIZEOF\|WIDTH\)' %T/powerpc64-device-defines | grep -v '__LDBL\|_LONG_DOUBLE' > %T/powerpc64-device-defines-filtered // RUN: diff %T/powerpc64-host-defines-filtered %T/powerpc64-device-defines-filtered _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits