Author: Joseph Huber Date: 2020-10-19T13:41:53-04:00 New Revision: 24df30efda6169915bc75bbf78d4c7f65d5f57e2
URL: https://github.com/llvm/llvm-project/commit/24df30efda6169915bc75bbf78d4c7f65d5f57e2 DIFF: https://github.com/llvm/llvm-project/commit/24df30efda6169915bc75bbf78d4c7f65d5f57e2.diff LOG: [OpenMP] Fixing OpenMP/driver.c failing on 32-bit hosts The changes made in D88594 caused the test OpenMP/driver.c to fail on a 32-bit host becuase it was offloading to a 64-bit architecture by default. The offloading test was moved to a new file and a feature was added to the lit config to check for a 64-bit host. Reviewed By: jdoerfert Differential Revision: https://reviews.llvm.org/D89696 Added: clang/test/OpenMP/driver-openmp-target.c Modified: clang/test/OpenMP/driver.c clang/test/lit.cfg.py Removed: ################################################################################ diff --git a/clang/test/OpenMP/driver-openmp-target.c b/clang/test/OpenMP/driver-openmp-target.c new file mode 100644 index 000000000000..bb58b386c06a --- /dev/null +++ b/clang/test/OpenMP/driver-openmp-target.c @@ -0,0 +1,5 @@ +// REQUIRES: x86-registered-target +// REQUIRES: clang-64-bits +// RUN: %clang %s -c -E -dM -fopenmp=libomp -fopenmp-version=45 -fopenmp-targets=x86_64-unknown-unknown -o - | FileCheck --check-prefix=CHECK-45-VERSION --check-prefix=CHECK-45-VERSION2 %s +// CHECK-45-VERSION: #define _OPENMP 201511 +// CHECK-45-VERSION2: #define _OPENMP 201511 diff --git a/clang/test/OpenMP/driver.c b/clang/test/OpenMP/driver.c index 047478256f9f..d82e92b4e889 100644 --- a/clang/test/OpenMP/driver.c +++ b/clang/test/OpenMP/driver.c @@ -27,7 +27,6 @@ // RUN: %clang %s -c -E -dM -fopenmp=libomp -fopenmp-version=45 | FileCheck --check-prefix=CHECK-45-VERSION %s // RUN: %clang %s -c -E -dM -fopenmp=libomp -fopenmp-version=45 -fopenmp-simd | FileCheck --check-prefix=CHECK-45-VERSION %s -// RUN: %clang %s -c -E -dM -fopenmp=libomp -fopenmp-version=45 -fopenmp-targets=x86_64-unknown-unknown -o - | FileCheck --check-prefix=CHECK-45-VERSION --check-prefix=CHECK-45-VERSION2 %s // CHECK-45-VERSION: #define _OPENMP 201511 // CHECK-45-VERSION2: #define _OPENMP 201511 diff --git a/clang/test/lit.cfg.py b/clang/test/lit.cfg.py index f4657f58236c..004ee39a9795 100644 --- a/clang/test/lit.cfg.py +++ b/clang/test/lit.cfg.py @@ -1,6 +1,7 @@ # -*- Python -*- import os +import sys import platform import re import subprocess @@ -167,6 +168,10 @@ def is_filesystem_case_insensitive(): if platform.system() not in ['Windows']: config.available_features.add('can-remove-opened-file') +# Check 64-bit host +if sys.maxsize > 2**32: + config.available_features.add("clang-64-bits") + def calculate_arch_features(arch_string): features = [] _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
