Merge remote-tracking branch 'upstream/main'

mysterymath · mysterymath · commit 5e93b40d79c2 · 2024-11-14T15:53:33.000-08:00
diff --git a/External/HIP/CMakeLists.txt b/External/HIP/CMakeLists.txt
@@ -16,7 +16,9 @@ macro(create_local_hip_tests VariantSuffix)
   list(APPEND HIP_LOCAL_TESTS with-fopenmp)
   list(APPEND HIP_LOCAL_TESTS saxpy)
   list(APPEND HIP_LOCAL_TESTS memmove)
-  list(APPEND HIP_LOCAL_TESTS InOneWeekend)
+
+  # TODO: Re-enable InOneWeekend after it is fixed
+  #list(APPEND HIP_LOCAL_TESTS InOneWeekend)
   list(APPEND HIP_LOCAL_TESTS TheNextWeek)
 
   # Copy files needed for ray-tracing tests.
diff --git a/External/SPEC/SpecCPU2017.cmake b/External/SPEC/SpecCPU2017.cmake
@@ -157,6 +157,8 @@ macro (speccpu2017_benchmark)
     elseif (ARCH STREQUAL "AArch64" AND TARGET_OS STREQUAL "Linux" AND CMAKE_SIZEOF_VOID_P EQUAL 8)
       # Linux ARM
       list(APPEND SPEC_COMMON_DEFS "-DSPEC_LINUX_AARCH64")
+    elseif (ARCH STREQUAL "riscv64")
+      list(APPEND SPEC_COMMON_DEFS "-DSPEC_MANUAL_CONFIG")
     elseif (ARCH STREQUAL "x86" AND TARGET_OS STREQUAL "Windows")
       # Windows x86/x64
     elseif (TARGET_OS STREQUAL "Darwin")
diff --git a/Fortran/gfortran/regression/DisabledFiles.cmake b/Fortran/gfortran/regression/DisabledFiles.cmake
@@ -1199,6 +1199,7 @@ file(GLOB FAILING_FILES CONFIGURE_DEPENDS
   pr90290.f90
   pr91564.f90
   rank_3.f90
+  assumed_rank_5.f90
 
   # Requires behaviour specific to -std=f2008 and fails with -std=f2018.
   finalize_38a.f90
@@ -1779,6 +1780,9 @@ file(GLOB FAILING_FILES CONFIGURE_DEPENDS
   bounds_check_17.f90
   pr48958.f90
 
+  # Require -fcheck=pointer.
+  pointer_check_6.f90
+
   # These files require the __truncsfbf2 intrinsic that is not available
   # before GCC 13. Alternatively, it requires compiler-rt to be built and a
   # command line option provided to instruct the compiler to use it. Currently,
@@ -1846,4 +1850,11 @@ file(GLOB FAILING_FILES CONFIGURE_DEPENDS
 
   # Test needs to add -pedantic to show the error
   pr32601.f03
+
+  # Tests expect semantic errors that are not raised.
+  c_sizeof_7.f90
+
+  # Tests that use "PRINT namelistname"
+  namelist_print_2.f
+  print_fmt_2.f90
 )
diff --git a/Fortran/gfortran/regression/analyzer/tests.cmake b/Fortran/gfortran/regression/analyzer/tests.cmake
@@ -1,5 +1,7 @@
 # This file was generated by update-test-config.py
 #
+#                            DO NOT EDIT THIS FILE
+#
 # Each line in this file corresponds to a single test. The format of each line
 # is:
 #
diff --git a/Fortran/gfortran/regression/asan/tests.cmake b/Fortran/gfortran/regression/asan/tests.cmake
@@ -1,5 +1,7 @@
 # This file was generated by update-test-config.py
 #
+#                            DO NOT EDIT THIS FILE
+#
 # Each line in this file corresponds to a single test. The format of each line
 # is:
 #
diff --git a/Fortran/gfortran/regression/c-interop/DisabledFiles.cmake b/Fortran/gfortran/regression/c-interop/DisabledFiles.cmake
@@ -124,4 +124,9 @@ file(GLOB FAILING_FILES CONFIGURE_DEPENDS
   # These files are expected to fail to compile, but succeed instead.
   c516.f90
   c524a.f90
+  c535b-3.f90
+  c535c-1.f90
+  c535c-2.f90
+  c535c-3.f90
+  c535c-4.f90
 )
diff --git a/Fortran/gfortran/regression/c-interop/tests.cmake b/Fortran/gfortran/regression/c-interop/tests.cmake
@@ -1,5 +1,7 @@
 # This file was generated by update-test-config.py
 #
+#                            DO NOT EDIT THIS FILE
+#
 # Each line in this file corresponds to a single test. The format of each line
 # is:
 #
diff --git a/Fortran/gfortran/regression/coarray/tests.cmake b/Fortran/gfortran/regression/coarray/tests.cmake
@@ -1,5 +1,7 @@
 # This file was generated by update-test-config.py
 #
+#                            DO NOT EDIT THIS FILE
+#
 # Each line in this file corresponds to a single test. The format of each line
 # is:
 #
diff --git a/Fortran/gfortran/regression/debug/tests.cmake b/Fortran/gfortran/regression/debug/tests.cmake
@@ -1,5 +1,7 @@
 # This file was generated by update-test-config.py
 #
+#                            DO NOT EDIT THIS FILE
+#
 # Each line in this file corresponds to a single test. The format of each line
 # is:
 #
diff --git a/Fortran/gfortran/regression/g77/tests.cmake b/Fortran/gfortran/regression/g77/tests.cmake
@@ -1,5 +1,7 @@
 # This file was generated by update-test-config.py
 #
+#                            DO NOT EDIT THIS FILE
+#
 # Each line in this file corresponds to a single test. The format of each line
 # is:
 #
diff --git a/Fortran/gfortran/regression/goacc-gomp/tests.cmake b/Fortran/gfortran/regression/goacc-gomp/tests.cmake
@@ -1,5 +1,7 @@
 # This file was generated by update-test-config.py
 #
+#                            DO NOT EDIT THIS FILE
+#
 # Each line in this file corresponds to a single test. The format of each line
 # is:
 #
diff --git a/Fortran/gfortran/regression/goacc/tests.cmake b/Fortran/gfortran/regression/goacc/tests.cmake
@@ -1,5 +1,7 @@
 # This file was generated by update-test-config.py
 #
+#                            DO NOT EDIT THIS FILE
+#
 # Each line in this file corresponds to a single test. The format of each line
 # is:
 #
diff --git a/Fortran/gfortran/regression/gomp/appendix-a/tests.cmake b/Fortran/gfortran/regression/gomp/appendix-a/tests.cmake
@@ -1,5 +1,7 @@
 # This file was generated by update-test-config.py
 #
+#                            DO NOT EDIT THIS FILE
+#
 # Each line in this file corresponds to a single test. The format of each line
 # is:
 #
diff --git a/Fortran/gfortran/regression/gomp/tests.cmake b/Fortran/gfortran/regression/gomp/tests.cmake
@@ -1,5 +1,7 @@
 # This file was generated by update-test-config.py
 #
+#                            DO NOT EDIT THIS FILE
+#
 # Each line in this file corresponds to a single test. The format of each line
 # is:
 #
diff --git a/Fortran/gfortran/regression/graphite/tests.cmake b/Fortran/gfortran/regression/graphite/tests.cmake
@@ -1,5 +1,7 @@
 # This file was generated by update-test-config.py
 #
+#                            DO NOT EDIT THIS FILE
+#
 # Each line in this file corresponds to a single test. The format of each line
 # is:
 #
diff --git a/Fortran/gfortran/regression/guality/tests.cmake b/Fortran/gfortran/regression/guality/tests.cmake
@@ -1,5 +1,7 @@
 # This file was generated by update-test-config.py
 #
+#                            DO NOT EDIT THIS FILE
+#
 # Each line in this file corresponds to a single test. The format of each line
 # is:
 #
diff --git a/Fortran/gfortran/regression/ieee/tests.cmake b/Fortran/gfortran/regression/ieee/tests.cmake
@@ -1,5 +1,7 @@
 # This file was generated by update-test-config.py
 #
+#                            DO NOT EDIT THIS FILE
+#
 # Each line in this file corresponds to a single test. The format of each line
 # is:
 #
diff --git a/Fortran/gfortran/regression/lto/tests.cmake b/Fortran/gfortran/regression/lto/tests.cmake
@@ -1,5 +1,7 @@
 # This file was generated by update-test-config.py
 #
+#                            DO NOT EDIT THIS FILE
+#
 # Each line in this file corresponds to a single test. The format of each line
 # is:
 #
diff --git a/Fortran/gfortran/regression/prof/tests.cmake b/Fortran/gfortran/regression/prof/tests.cmake
@@ -1,5 +1,7 @@
 # This file was generated by update-test-config.py
 #
+#                            DO NOT EDIT THIS FILE
+#
 # Each line in this file corresponds to a single test. The format of each line
 # is:
 #
diff --git a/Fortran/gfortran/regression/tests.cmake b/Fortran/gfortran/regression/tests.cmake
@@ -1,5 +1,7 @@
 # This file was generated by update-test-config.py
 #
+#                            DO NOT EDIT THIS FILE
+#
 # Each line in this file corresponds to a single test. The format of each line
 # is:
 #
diff --git a/Fortran/gfortran/regression/ubsan/tests.cmake b/Fortran/gfortran/regression/ubsan/tests.cmake
@@ -1,5 +1,7 @@
 # This file was generated by update-test-config.py
 #
+#                            DO NOT EDIT THIS FILE
+#
 # Each line in this file corresponds to a single test. The format of each line
 # is:
 #
diff --git a/Fortran/gfortran/regression/vect/tests.cmake b/Fortran/gfortran/regression/vect/tests.cmake
@@ -1,5 +1,7 @@
 # This file was generated by update-test-config.py
 #
+#                            DO NOT EDIT THIS FILE
+#
 # Each line in this file corresponds to a single test. The format of each line
 # is:
 #
diff --git a/Fortran/gfortran/torture/compile/tests.cmake b/Fortran/gfortran/torture/compile/tests.cmake
@@ -1,5 +1,7 @@
 # This file was generated by update-test-config.py
 #
+#                            DO NOT EDIT THIS FILE
+#
 # Each line in this file corresponds to a single test. The format of each line
 # is:
 #
diff --git a/Fortran/gfortran/torture/execute/tests.cmake b/Fortran/gfortran/torture/execute/tests.cmake
@@ -1,5 +1,7 @@
 # This file was generated by update-test-config.py
 #
+#                            DO NOT EDIT THIS FILE
+#
 # Each line in this file corresponds to a single test. The format of each line
 # is:
 #
diff --git a/Fortran/gfortran/utils/update-test-config.py b/Fortran/gfortran/utils/update-test-config.py
@@ -581,6 +581,8 @@ def main() -> int:
         with open(config_file, 'w') as f:
             f.write("""# This file was generated by update-test-config.py
 #
+#                            DO NOT EDIT THIS FILE
+#
 # Each line in this file corresponds to a single test. The format of each line
 # is:
 #
diff --git a/MicroBenchmarks/LoopVectorization/CMakeLists.txt b/MicroBenchmarks/LoopVectorization/CMakeLists.txt
@@ -26,3 +26,12 @@ llvm_test_executable(LoopInterleavingBenchmarks
 )
 
 target_link_libraries(LoopInterleavingBenchmarks benchmark)
+
+llvm_test_run()
+
+llvm_test_executable(LoopEpilogueVectorizationBenchmarks
+  main.cpp
+  EpilogueVectorization.cpp
+)
+
+target_link_libraries(LoopEpilogueVectorizationBenchmarks benchmark)
diff --git a/MicroBenchmarks/LoopVectorization/EpilogueVectorization.cpp b/MicroBenchmarks/LoopVectorization/EpilogueVectorization.cpp
@@ -0,0 +1,88 @@
+// This program tests performance impact of Epilogue Vectorization
+// with varying epilogue lengths, and vector widths.
+#include <cstdint>
+#include <memory>
+#include <random>
+
+#include "benchmark/benchmark.h"
+
+static std::mt19937 rng;
+uint64_t g_sum = 0;
+
+// Initialize array A with random numbers.
+template <typename Ty>
+static void init_data(const std::unique_ptr<Ty[]> &A, unsigned N) {
+  std::uniform_int_distribution<Ty> distrib(std::numeric_limits<Ty>::min(),
+                                            std::numeric_limits<Ty>::max());
+  for (unsigned I = 0; I < N; I++)
+    A[I] = distrib(rng);
+}
+
+// Helper to block optimizing \p F based on its arguments.
+template <typename F, typename... Args>
+__attribute__((optnone)) static uint64_t callThroughOptnone(F &&f, Args &&...args) {
+  return f(std::forward<Args>(args)...);
+}
+
+template <typename Ty>
+static void __attribute__((always_inline))
+runBenchForEpilogueVectorization(benchmark::State &state,
+                                 uint64_t (*Fn)(Ty *, Ty *, Ty *, int)) {
+  auto Iterations = state.range(0);
+  std::unique_ptr<Ty[]> A(new Ty[Iterations]);
+  std::unique_ptr<Ty[]> B(new Ty[Iterations]);
+  std::unique_ptr<Ty[]> C(new Ty[Iterations]);
+  init_data(A, Iterations);
+  init_data(B, Iterations);
+  init_data(C, Iterations);
+  for (auto _ : state) {
+    benchmark::DoNotOptimize(A);
+    benchmark::DoNotOptimize(B);
+    benchmark::DoNotOptimize(C);
+    benchmark::ClobberMemory();
+    g_sum += callThroughOptnone(Fn, &A[0], &B[0], &C[0], Iterations);
+  }
+}
+
+template <typename Ty>
+static uint64_t __attribute__((noinline))
+loopAutoVec(Ty *A, Ty *B, Ty *C, int Iterations) {
+  for (int J = 0; J < Iterations; J++) {
+    A[J] = B[J] + C[J];
+  }
+  return 0;
+}
+
+template <typename Ty>
+static uint64_t __attribute__((noinline))
+loopWithReductionAutoVec(Ty *A, Ty *B, Ty *C, int Iterations) {
+  uint64_t sum = 0;
+  for (int J = 0; J < Iterations; J++) {
+    sum += A[J];
+  }
+  return sum;
+}
+
+template <typename Ty> void benchAutoVec(benchmark::State &state) {
+  runBenchForEpilogueVectorization<Ty>(state, &loopAutoVec<Ty>);
+}
+
+template <typename Ty> void benchReductionAutoVec(benchmark::State &state) {
+  runBenchForEpilogueVectorization<Ty>(state, &loopWithReductionAutoVec<Ty>);
+}
+
+#ifdef ALL_LOOP_EPILOGUE_TESTS
+BENCHMARK_TEMPLATE(benchAutoVec, uint8_t)->DenseRange(65, 127, 1);
+BENCHMARK_TEMPLATE(benchReductionAutoVec, uint8_t)->DenseRange(65, 127, 1);
+BENCHMARK_TEMPLATE(benchAutoVec, uint16_t)->DenseRange(65, 127, 1);
+BENCHMARK_TEMPLATE(benchReductionAutoVec, uint16_t)->DenseRange(65, 127, 1);
+BENCHMARK_TEMPLATE(benchAutoVec, uint32_t)->DenseRange(65, 127, 1);
+BENCHMARK_TEMPLATE(benchReductionAutoVec, uint32_t)->DenseRange(65, 127, 1);
+#else
+BENCHMARK_TEMPLATE(benchAutoVec, uint8_t)->Arg(65)->Arg(127);
+BENCHMARK_TEMPLATE(benchReductionAutoVec, uint8_t)->Arg(65)->Arg(127);
+BENCHMARK_TEMPLATE(benchAutoVec, uint16_t)->Arg(65)->Arg(127);
+BENCHMARK_TEMPLATE(benchReductionAutoVec, uint16_t)->Arg(65)->Arg(127);
+BENCHMARK_TEMPLATE(benchAutoVec, uint32_t)->Arg(65)->Arg(127);
+BENCHMARK_TEMPLATE(benchReductionAutoVec, uint32_t)->Arg(65)->Arg(127);
+#endif
diff --git a/MicroBenchmarks/libs/benchmark/test/options_test.cc b/MicroBenchmarks/libs/benchmark/test/options_test.cc
@@ -67,6 +67,8 @@ void BM_explicit_iteration_count(benchmark::State& state) {
   assert(state.max_iterations == 42);
   size_t actual_iterations = 0;
   for (auto _ : state) ++actual_iterations;
+  benchmark::DoNotOptimize(actual_iterations);
+  assert(actual_iterations == 42);
   assert(state.iterations() == state.max_iterations);
   assert(state.iterations() == 42);
 }
diff --git a/MultiSource/UnitTests/Float/rounding/rounding.h b/MultiSource/UnitTests/Float/rounding/rounding.h
@@ -22,7 +22,7 @@
 // Not all targets support getting/setting rounding mode using builtin
 // functions.
 #if defined(__x86_64__) || defined(__aarch64__) || defined(__arm__) || \
-    defined(__riscv)
+    defined(__riscv) || defined(__ppc__)
 #define FLOAT_AVAILABLE 1
 #define DOUBLE_AVAILABLE 1
 #endif
diff --git a/SingleSource/Benchmarks/Misc/CMakeLists.txt b/SingleSource/Benchmarks/Misc/CMakeLists.txt
@@ -35,10 +35,20 @@ if(NOT ARCH STREQUAL "PowerPC" OR NOT TARGET_OS STREQUAL "Darwin")
   list(APPEND Source dt.c)
 endif()
 if(ARCH STREQUAL "AArch64")
-  file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/CheckHaveAArch64FMV.h "void __init_cpu_features_resolver(void);")
-  check_symbol_exists(__init_cpu_features_resolver ${CMAKE_CURRENT_BINARY_DIR}/CheckHaveAArch64FMV.h HAVE_AARCH64_FMV)
-  if(HAVE_AARCH64_FMV AND TARGET_OS STREQUAL "Darwin")
-    list(APPEND Source aarch64-init-cpu-features.c)
+  if(TARGET_OS STREQUAL "Darwin")
+    file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/CheckHasAArch64FMV.h "void __init_cpu_features_resolver(void);")
+    check_symbol_exists(__init_cpu_features_resolver ${CMAKE_CURRENT_BINARY_DIR}/CheckHasAArch64FMV.h HAS_AARCH64_FMV)
+    if(HAS_AARCH64_FMV)
+      list(APPEND CFLAGS -DHAS_DARWIN_FMV)
+      list(APPEND Source aarch64-init-cpu-features.c)
+    endif()
+  elseif(TARGET_OS STREQUAL "Linux")
+    file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/CheckHasAArch64FMV.h "void __init_cpu_features(void);")
+    check_symbol_exists(__init_cpu_features ${CMAKE_CURRENT_BINARY_DIR}/CheckHasAArch64FMV.h HAS_AARCH64_FMV)
+    if(HAS_AARCH64_FMV)
+      list(APPEND CFLAGS -DHAS_LINUX_FMV)
+      list(APPEND Source aarch64-init-cpu-features.c)
+    endif()
   endif()
 endif()
 llvm_singlesource()
diff --git a/SingleSource/Benchmarks/Misc/aarch64-init-cpu-features.c b/SingleSource/Benchmarks/Misc/aarch64-init-cpu-features.c
diff --git a/SingleSource/UnitTests/AArch64/acle-fmv-features.c b/SingleSource/UnitTests/AArch64/acle-fmv-features.c
diff --git a/SingleSource/UnitTests/AArch64/acle-fmv-features.reference_output b/SingleSource/UnitTests/AArch64/acle-fmv-features.reference_output
diff --git a/SingleSource/UnitTests/Vector/LASX/lasx-xvfmadd_d.c b/SingleSource/UnitTests/Vector/LASX/lasx-xvfmadd_d.c
diff --git a/SingleSource/UnitTests/Vector/LASX/lasx_test_util.h b/SingleSource/UnitTests/Vector/LASX/lasx_test_util.h
diff --git a/SingleSource/UnitTests/Vector/LSX/lsx-vfmadd_d.c b/SingleSource/UnitTests/Vector/LSX/lsx-vfmadd_d.c
diff --git a/SingleSource/UnitTests/Vector/LSX/lsx_test_util.h b/SingleSource/UnitTests/Vector/LSX/lsx_test_util.h
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
diff --git a/tools/not.cpp b/tools/not.cpp
diff --git a/tools/test/CMakeLists.txt b/tools/test/CMakeLists.txt
diff --git a/tools/test/abort.c b/tools/test/abort.c
diff --git a/tools/test/check_env.c b/tools/test/check_env.c
diff --git a/tools/test/ret0.c b/tools/test/ret0.c
diff --git a/tools/test/ret1.c b/tools/test/ret1.c
diff --git a/tools/test/test_not.sh b/tools/test/test_not.sh

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`# This file was generated by update-test-config.py`
`2`	`2`	`#`
	`3`	`+# DO NOT EDIT THIS FILE`
	`4`	`+#`
`3`	`5`	`# Each line in this file corresponds to a single test. The format of each line`
`4`	`6`	`# is:`
`5`	`7`	`#`