Auto pulldown and update tc files for xmain branch

Auto pulldown and update tc files for xmain branch on 20220818

Author: nstester

External/SPEC/CINT2006/401.bzip2/CMakeLists.txt

@@ -21,5 +21,7 @@ test_input(ref data/all/input/input.program 280 input.program.out)
 test_input(ref data/ref/input/text.html 280 text.html.out)
 test_input(ref data/all/input/input.combined 200 input.combined.out)
 
+
+list(APPEND CFLAGS -Wno-int-conversion)
 llvm_test_executable(401.bzip2 ${Source})
 llvm_test_data_spec_default(401.bzip2)

Fortran/UnitTests/fcvs21_f95/CMakeLists.txt

@@ -35,13 +35,17 @@ llvm_test_prepare(rm -f %S/fort.*)
 
 # Group 1:
 # Tests 905 and 907 use list-directed output, for which the standard allows some
-# flexibility, e.g.,  with regards to how many white space characters or
+# flexibility, e.g., with regards to how many white space characters or
 # floating point decimals to print. Treat them separately.
+# FIXME: Reenable these tests after moving the buildbots from using
+# flang-to-external-fc to using flang-new.
 set(SPECIAL_CASES "FM905.f" "FM907.f")
-set(Source ${SPECIAL_CASES})
-set(FP_IGNOREWHITESPACE ON)
-llvm_singlesource()
-set(Source)
+if (NOT CMAKE_Fortran_COMPILER_ID STREQUAL "LLVMFlang")
+  set(Source ${SPECIAL_CASES})
+  set(FP_IGNOREWHITESPACE ON)
+  llvm_singlesource()
+  set(Source)
+endif()
 
 # Group 2:
 # Generic case. Make sure to exclude the special cases which have already been
@@ -61,6 +65,20 @@ else()
   list(FILTER Source EXCLUDE REGEX "FM509\.f$")
 endif()
 
+# Skip some tests that currently fail with flang on AArch64 when using libpgmath.
+# FIXME: Reenable these tests after libpgmath is fixed or after we no longer
+# depend on it.
+if (CMAKE_Fortran_COMPILER_ID STREQUAL "LLVMFlang" AND ARCH STREQUAL "AArch64")
+  # Regex because the GLOB returns the full path to each file
+  list(FILTER Source EXCLUDE REGEX "FM813\.f$")
+  list(FILTER Source EXCLUDE REGEX "FM815\.f$")
+  list(FILTER Source EXCLUDE REGEX "FM817\.f$")
+  list(FILTER Source EXCLUDE REGEX "FM820\.f$")
+  list(FILTER Source EXCLUDE REGEX "FM828\.f$")
+  list(FILTER Source EXCLUDE REGEX "FM831\.f$")
+  list(FILTER Source EXCLUDE REGEX "FM833\.f$")
+endif()
+
 set(FP_TOLERANCE 1.0e-11) # set by the most sensitive numerical test
 set(FP_IGNOREWHITESPACE OFF)
 llvm_singlesource()

MultiSource/Applications/Burg/CMakeLists.txt

@@ -1,5 +1,5 @@
 list(APPEND CPPFLAGS -DDEBUG)
-list(APPEND CFLAGS -std=gnu89)
+list(APPEND CFLAGS -std=gnu89 -Wno-int-conversion)
 set(RUN_OPTIONS < sample.gr)
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR})

MultiSource/Applications/Burg/Makefile

@@ -2,7 +2,7 @@ LEVEL = ../../..
 
 PROG     = burg
 CPPFLAGS = -DDEBUG
-CFLAGS  += -std=gnu89
+CFLAGS  += -std=gnu89 -Wno-int-conversion
 LDFLAGS  = -lstdc++
 
 STDIN_FILENAME = $(PROJ_SRC_DIR)/sample.gr

MultiSource/Applications/siod/CMakeLists.txt

@@ -1,5 +1,5 @@
 list(APPEND CPPFLAGS -D__USE_MISC -D__USE_GNU -D__USE_SVID -D__USE_XOPEN_EXTENDED -D__USE_XOPEN -Dunix)
-list(APPEND CFLAGS -Wno-implicit-function-declaration -Wno-implicit-int)
+list(APPEND CFLAGS -Wno-implicit-function-declaration -Wno-implicit-int -Wno-int-conversion)
 list(APPEND LDFLAGS -lm)
 set(RUN_OPTIONS -v1 test.scm)
 llvm_multisource(siod)

MultiSource/Applications/siod/Makefile

@@ -1,7 +1,7 @@
 LEVEL = ../../..
 PROG     = siod
 CPPFLAGS = -D__USE_MISC -D__USE_GNU -D__USE_SVID -D__USE_XOPEN_EXTENDED -D__USE_XOPEN -Dunix
-CFLAGS += -Wno-implicit-function-declaration -Wno-implicit-int
+CFLAGS += -Wno-implicit-function-declaration -Wno-implicit-int -Wno-int-conversion
 LDFLAGS  = -lm $(TOOLLINKOPTS)
 
 RUN_OPTIONS = -v1 $(PROJ_SRC_DIR)/test.scm

MultiSource/Benchmarks/Prolangs-C/assembler/CMakeLists.txt

@@ -1,2 +1,3 @@
+list(APPEND CFLAGS -Wno-int-conversion)
 list(APPEND LDFLAGS -lm)
 llvm_multisource(assembler)

MultiSource/Benchmarks/Prolangs-C/assembler/Makefile

@@ -2,5 +2,6 @@ LEVEL = ../../../..
 
 PROG = assembler
 LDFLAGS = -lm
+CFLAGS += -Wno-int-conversion
 include $(LEVEL)/MultiSource/Makefile.multisrc
 

MultiSource/Benchmarks/Prolangs-C/bison/CMakeLists.txt

@@ -1,4 +1,4 @@
-list(APPEND CFLAGS -Wno-implicit-function-declaration -Wno-implicit-int)
+list(APPEND CFLAGS -Wno-implicit-function-declaration -Wno-implicit-int -Wno-int-conversion)
 set(RUN_OPTIONS parse.y.in -v)
 llvm_multisource(mybison)
 llvm_test_data(mybison parse.y.in)

MultiSource/Benchmarks/Prolangs-C/bison/Makefile

@@ -1,6 +1,6 @@
 LEVEL = ../../../..
 
-CFLAGS += -Wno-implicit-function-declaration -Wno-implicit-int
+CFLAGS += -Wno-implicit-function-declaration -Wno-implicit-int -Wno-int-conversion
 
 PROG = mybison
 RUN_OPTIONS = $(PROJ_SRC_DIR)/parse.y.in -v

MultiSource/Benchmarks/Prolangs-C/football/CMakeLists.txt

@@ -1 +1,2 @@
+list(APPEND CFLAGS -Wno-int-conversion)
 llvm_multisource(football)

MultiSource/Benchmarks/Prolangs-C/football/Makefile

@@ -1,5 +1,6 @@
 LEVEL = ../../../..
 
 PROG = football
+CFLAGS += -Wno-int-conversion
 include $(LEVEL)/MultiSource/Makefile.multisrc
 

MultiSource/Benchmarks/Prolangs-C/unix-smail/CMakeLists.txt

@@ -1,3 +1,4 @@
+list(APPEND CFLAGS -Wno-int-conversion)
 set(RUN_OPTIONS -v ALL < main.c)
 llvm_multisource(unix-smail)
 llvm_test_data(unix-smail main.c)

MultiSource/Benchmarks/Prolangs-C/unix-smail/Makefile

@@ -1,6 +1,7 @@
 LEVEL = ../../../..
 
 PROG = unix-smail
+CFLAGS += -Wno-int-conversion
 RUN_OPTIONS = -v ALL
 STDIN_FILENAME = $(PROJ_SRC_DIR)/main.c
 

MultiSource/Benchmarks/TSVC/CMakeLists.txt

@@ -1,3 +1,8 @@
+
+# Expect exact numeric results. However, the libc printf implementation emits
+# 'E' in scientific notation, while the reference output contains 'e'.
+set(FP_ABSTOLERANCE 0.0)
+
 add_subdirectory(ControlFlow-dbl)
 add_subdirectory(ControlFlow-flt)
 add_subdirectory(ControlLoops-dbl)

MultiSource/Benchmarks/TSVC/Recurrences-flt/CMakeLists.txt

@@ -1,4 +1,4 @@
 list(APPEND LDFLAGS -lm)
-list(APPEND CFLAGS -std=gnu99)
+list(APPEND CFLAGS -std=gnu99 -Wno-int-conversion)
 set(RUN_OPTIONS 20000 5)
 llvm_multisource(Recurrences-flt)

MultiSource/Benchmarks/TSVC/Recurrences-flt/Makefile

@@ -2,7 +2,7 @@ LEVEL = ../../../..
 
 PROG     = Recurrences-flt
 LDFLAGS  = -lm
-CFLAGS += -std=gnu99
+CFLAGS += -std=gnu99 -Wno-int-conversion
 RUN_OPTIONS = 20000 5
 include $(LEVEL)/MultiSource/Makefile.multisrc
 

MultiSource/Benchmarks/VersaBench/beamformer/CMakeLists.txt

@@ -1,3 +1,4 @@
+list(APPEND CFLAGS -Wno-int-conversion)
 list(APPEND LDFLAGS -lm)
 if(LARGE_PROBLEM_SIZE)
   set(RUN_OPTIONS -i 400)

MultiSource/Benchmarks/VersaBench/beamformer/Makefile

@@ -1,6 +1,6 @@
 LEVEL = ../../../..
 LDFLAGS += -lm
-CFLAGS += -DFP_ABSTOLERANCE=1e-5
+CFLAGS += -DFP_ABSTOLERANCE=1e-5 -Wno-int-conversion
 
 PROG     = beamformer
 ifdef LARGE_PROBLEM_SIZE

SYCL/AOT/Inputs/aot.cpp

@@ -11,38 +11,37 @@
 #include <array>
 #include <iostream>
 
-constexpr cl::sycl::access::mode sycl_read = cl::sycl::access::mode::read;
-constexpr cl::sycl::access::mode sycl_write = cl::sycl::access::mode::write;
+constexpr sycl::access::mode sycl_read = sycl::access::mode::read;
+constexpr sycl::access::mode sycl_write = sycl::access::mode::write;
 
 template <typename T> class SimpleVadd;
 
 template <typename T, size_t N>
 void simple_vadd(const std::array<T, N> &VA, const std::array<T, N> &VB,
                  std::array<T, N> &VC) {
-  cl::sycl::queue deviceQueue([](cl::sycl::exception_list ExceptionList) {
+  sycl::queue deviceQueue([](sycl::exception_list ExceptionList) {
     for (std::exception_ptr ExceptionPtr : ExceptionList) {
       try {
         std::rethrow_exception(ExceptionPtr);
-      } catch (cl::sycl::exception &E) {
+      } catch (sycl::exception &E) {
         std::cerr << E.what();
       } catch (...) {
         std::cerr << "Unknown async exception was caught." << std::endl;
       }
     }
   });
 
-  cl::sycl::range<1> numOfItems{N};
-  cl::sycl::buffer<T, 1> bufferA(VA.data(), numOfItems);
-  cl::sycl::buffer<T, 1> bufferB(VB.data(), numOfItems);
-  cl::sycl::buffer<T, 1> bufferC(VC.data(), numOfItems);
+  sycl::range<1> numOfItems{N};
+  sycl::buffer<T, 1> bufferA(VA.data(), numOfItems);
+  sycl::buffer<T, 1> bufferB(VB.data(), numOfItems);
+  sycl::buffer<T, 1> bufferC(VC.data(), numOfItems);
 
-  deviceQueue.submit([&](cl::sycl::handler &cgh) {
+  deviceQueue.submit([&](sycl::handler &cgh) {
     auto accessorA = bufferA.template get_access<sycl_read>(cgh);
     auto accessorB = bufferB.template get_access<sycl_read>(cgh);
     auto accessorC = bufferC.template get_access<sycl_write>(cgh);
 
-    cgh.parallel_for<class SimpleVadd<T>>(numOfItems,
-    [=](cl::sycl::id<1> wiID) {
+    cgh.parallel_for<class SimpleVadd<T>>(numOfItems, [=](sycl::id<1> wiID) {
       accessorC[wiID] = accessorA[wiID] + accessorB[wiID];
     });
   });
@@ -52,10 +51,10 @@ void simple_vadd(const std::array<T, N> &VA, const std::array<T, N> &VB,
 
 int main() {
   const size_t array_size = 4;
-  std::array<cl::sycl::cl_int, array_size> A = {{1, 2, 3, 4}},
-                                           B = {{1, 2, 3, 4}}, C;
-  std::array<cl::sycl::cl_float, array_size> D = {{1.f, 2.f, 3.f, 4.f}},
-                                             E = {{1.f, 2.f, 3.f, 4.f}}, F;
+  std::array<sycl::cl_int, array_size> A = {{1, 2, 3, 4}}, B = {{1, 2, 3, 4}},
+                                       C;
+  std::array<sycl::cl_float, array_size> D = {{1.f, 2.f, 3.f, 4.f}},
+                                         E = {{1.f, 2.f, 3.f, 4.f}}, F;
   simple_vadd(A, B, C);
   simple_vadd(D, E, F);
   for (unsigned int i = 0; i < array_size; i++) {

SYCL/Assert/Inputs/kernels_in_file2.cpp

@@ -8,8 +8,8 @@
 
 #include <cassert>
 
-using namespace cl::sycl;
-using namespace cl::sycl::access;
+using namespace sycl;
+using namespace sycl::access;
 
 int calculus(int X) {
   assert(X && "this message from calculus");
@@ -21,25 +21,25 @@ void check_nil(int value) { assert(value && "this message from file2"); }
 static constexpr size_t BUFFER_SIZE = 4;
 
 void enqueueKernel_1_fromFile2(queue *Q) {
-  cl::sycl::range<1> numOfItems{BUFFER_SIZE};
-  cl::sycl::buffer<int, 1> Buf(numOfItems);
+  sycl::range<1> numOfItems{BUFFER_SIZE};
+  sycl::buffer<int, 1> Buf(numOfItems);
 
   Q->submit([&](handler &CGH) {
     auto Acc = Buf.template get_access<mode::read_write>(CGH);
 
     CGH.parallel_for<class kernel1_from_separate_file>(
-        numOfItems, [=](cl::sycl::id<1> wiID) { check_nil(Acc[wiID]); });
+        numOfItems, [=](sycl::id<1> wiID) { check_nil(Acc[wiID]); });
   });
 }
 
 void enqueueKernel_2_fromFile2(queue *Q) {
-  cl::sycl::range<1> numOfItems{BUFFER_SIZE};
-  cl::sycl::buffer<int, 1> Buf(numOfItems);
+  sycl::range<1> numOfItems{BUFFER_SIZE};
+  sycl::buffer<int, 1> Buf(numOfItems);
 
   Q->submit([&](handler &CGH) {
     auto Acc = Buf.template get_access<mode::read_write>(CGH);
 
     CGH.parallel_for<class kernel2_from_separate_file>(
-        numOfItems, [=](cl::sycl::id<1> wiID) { check_nil(Acc[wiID]); });
+        numOfItems, [=](sycl::id<1> wiID) { check_nil(Acc[wiID]); });
   });
 }

SYCL/Assert/assert_in_kernels.cpp

@@ -1,6 +1,4 @@
 // REQUIRES: linux
-// FIXME unsupported on HIP until fallback libdevice becomes available
-// UNSUPPORTED: hip
 // RUN: %clangxx -DSYCL_FALLBACK_ASSERT=1 -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out &> %t.txt || true
 // RUN: %CPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
@@ -11,12 +9,12 @@
 // RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --check-prefix=CHECK-ACC --input-file %t.txt
 //
 // CHECK-NOT:  One shouldn't see this message
-// CHECK:      {{.*}}assert_in_kernels.hpp:26: void kernelFunc2(int *, int): {{.*}} [{{[0,2]}},0,0], {{.*}} [0,0,0]
+// CHECK:      {{.*}}assert_in_kernels.hpp:25: void kernelFunc2(int *, int): {{.*}} [{{[0,2]}},0,0], {{.*}} [0,0,0]
 // CHECK-SAME: Assertion `Buf[wiID] == 0 && "from assert statement"` failed.
 // CHECK-NOT:  test aborts earlier, one shouldn't see this message
 // CHECK-NOT:  The test ended.
 //
-// CHECK-ACC-NOT: {{.*}}assert_in_kernels.hpp:26: void kernelFunc2(int *, int): {{.*}} [{{[0,2]}},0,0], {{.*}} [0,0,0]
+// CHECK-ACC-NOT: {{.*}}assert_in_kernels.hpp:25: void kernelFunc2(int *, int): {{.*}} [{{[0,2]}},0,0], {{.*}} [0,0,0]
 // CHECK-ACC: The test ended.
 
 #include "assert_in_kernels.hpp"

SYCL/Assert/assert_in_kernels.hpp

@@ -2,8 +2,8 @@
 #include <iostream>
 #include <sycl/sycl.hpp>
 
-using namespace cl::sycl;
-using namespace cl::sycl::access;
+using namespace sycl;
+using namespace sycl::access;
 
 void kernelFunc1(int *Buf, int wiID) {
   Buf[wiID] = 9;
@@ -15,8 +15,7 @@ void assertTest1(queue &Q, buffer<int, 1> &Buf) {
     auto Acc = Buf.template get_access<mode::read_write>(CGH);
 
     CGH.parallel_for<class Kernel_1>(
-        Buf.get_range(),
-        [=](cl::sycl::id<1> wiID) { kernelFunc1(&Acc[0], wiID); });
+        Buf.get_range(), [=](sycl::id<1> wiID) { kernelFunc1(&Acc[0], wiID); });
   });
 }
 
@@ -31,8 +30,7 @@ void assertTest2(queue &Q, buffer<int, 1> &Buf) {
     auto Acc = Buf.template get_access<mode::read_write>(CGH);
 
     CGH.parallel_for<class Kernel_2>(
-        Buf.get_range(),
-        [=](cl::sycl::id<1> wiID) { kernelFunc2(&Acc[0], wiID); });
+        Buf.get_range(), [=](sycl::id<1> wiID) { kernelFunc2(&Acc[0], wiID); });
   });
 }
 
@@ -47,15 +45,14 @@ void assertTest3(queue &Q, buffer<int, 1> &Buf) {
     auto Acc = Buf.template get_access<mode::read_write>(CGH);
 
     CGH.parallel_for<class Kernel_3>(
-        Buf.get_range(),
-        [=](cl::sycl::id<1> wiID) { kernelFunc3(&Acc[0], wiID); });
+        Buf.get_range(), [=](sycl::id<1> wiID) { kernelFunc3(&Acc[0], wiID); });
   });
 }
 
 int main(int Argc, const char *Argv[]) {
   std::array<int, 4> Vec = {1, 2, 3, 4};
-  cl::sycl::range<1> numOfItems{Vec.size()};
-  cl::sycl::buffer<int, 1> Buf(Vec.data(), numOfItems);
+  sycl::range<1> numOfItems{Vec.size()};
+  sycl::buffer<int, 1> Buf(Vec.data(), numOfItems);
 
   queue Q;
   assertTest1(Q, Buf);

SYCL/Assert/assert_in_kernels_ndebug.cpp

@@ -1,5 +1,3 @@
-// FIXME unsupported on HIP until fallback libdevice becomes available
-// UNSUPPORTED: hip
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -DNDEBUG %S/assert_in_kernels.cpp -o %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out %CPU_CHECK_PLACEHOLDER
 // RUN: %GPU_RUN_PLACEHOLDER %t.out %GPU_CHECK_PLACEHOLDER

SYCL/Assert/assert_in_kernels_win.cpp

@@ -1,5 +1,4 @@
 // REQUIRES: windows
-// UNSUPPORTED: hip
 // RUN: %clangxx -DSYCL_FALLBACK_ASSERT=1 -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out &> %t.txt || true
 // RUN: %CPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
@@ -12,12 +11,12 @@
 // CHECK-NOT:  One shouldn't see this message
 // FIXME Windows version prints '(null)' instead of '<unknown func>' once in a
 // while for some insane reason.
-// CHECK:      {{.*}}assert_in_kernels.hpp:26: {{<unknown func>|(null)}}: {{.*}} [{{[0,2]}},0,0], {{.*}} [0,0,0]
+// CHECK:      {{.*}}assert_in_kernels.hpp:25: {{<unknown func>|(null)}}: {{.*}} [{{[0,2]}},0,0], {{.*}} [0,0,0]
 // CHECK-SAME: Assertion `Buf[wiID] == 0 && "from assert statement"` failed.
 // CHECK-NOT:  test aborts earlier, one shouldn't see this message
 // CHECK-NOT:  The test ended.
 //
-// CHECK-ACC-NOT: {{.*}}assert_in_kernels.hpp:26: {{<unknown func>|(null)}}: {{.*}} [{{[0,2]}},0,0], {{.*}} [0,0,0]
+// CHECK-ACC-NOT: {{.*}}assert_in_kernels.hpp:25: {{<unknown func>|(null)}}: {{.*}} [{{[0,2]}},0,0], {{.*}} [0,0,0]
 // CHECK-ACC: The test ended.
 
 #include "assert_in_kernels.hpp"

SYCL/Assert/assert_in_multiple_tus.cpp

@@ -1,6 +1,4 @@
 // REQUIRES: linux
-// FIXME unsupported on HIP until fallback libdevice becomes available
-// UNSUPPORTED: hip
 // RUN: %clangxx -DSYCL_FALLBACK_ASSERT=1 -fsycl -fsycl-targets=%sycl_triple -I %S/Inputs %s %S/Inputs/kernels_in_file2.cpp -o %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out &> %t.txt || true
 // RUN: %CPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt