[Openmp-commits] [openmp] 2142dc3 - OpenMP: Remove -fno-experimental-isel flag from testing

[Matt Arsenault via Openmp-commits]

Author: Matt Arsenault
Date: 2022-11-16T11:54:13-08:00
New Revision: 2142dc31df05c46bc9294640715f6ebbed41f48c

URL: https://github.com/llvm/llvm-project/commit/2142dc31df05c46bc9294640715f6ebbed41f48c
DIFF: https://github.com/llvm/llvm-project/commit/2142dc31df05c46bc9294640715f6ebbed41f48c.diff

LOG: OpenMP: Remove -fno-experimental-isel flag from testing

This effectively reverts 6f9e25d3824fb7b03dc6a403e1962d80a9c88ebe.

I didn't follow the complete history, but it seems this was added due
to AArch64's output changing in some fallback. Blockaddress definitely
works now, so just remove this.

Added: 
    

Modified: 
    openmp/cmake/DetectTestCompiler/CMakeLists.txt
    openmp/cmake/OpenMPTesting.cmake

Removed: 
    


################################################################################
diff  --git a/openmp/cmake/DetectTestCompiler/CMakeLists.txt b/openmp/cmake/DetectTestCompiler/CMakeLists.txt
index dc709f59684a8..bc2aa52fbc1cf 100644
--- a/openmp/cmake/DetectTestCompiler/CMakeLists.txt
+++ b/openmp/cmake/DetectTestCompiler/CMakeLists.txt
@@ -30,20 +30,6 @@ find_package(Threads REQUIRED)
 set(C_FLAGS "${OpenMP_C_FLAGS} ${CMAKE_THREAD_LIBS_INIT}")
 set(CXX_FLAGS "${OpenMP_CXX_FLAGS} ${CMAKE_THREAD_LIBS_INIT}")
 
-# TODO: Implement blockaddress in GlobalISel and remove this flag!
-if (CMAKE_C_COMPILER_ID STREQUAL "Clang")
-  check_c_compiler_flag("-fno-experimental-isel" C_HAS_EXPERIMENTAL_ISEL_FLAG)
-  check_cxx_compiler_flag("-fno-experimental-isel" CXX_HAS_EXPERIMENTAL_ISEL_FLAG)
-  macro(add_experimental_isel_flag lang)
-    if (${lang}_HAS_EXPERIMENTAL_ISEL_FLAG)
-      set(${lang}_FLAGS "-fno-experimental-isel ${${lang}_FLAGS}")
-    endif()
-  endmacro(add_experimental_isel_flag)
-
-  add_experimental_isel_flag(C)
-  add_experimental_isel_flag(CXX)
-endif()
-
 check_c_compiler_flag("-fno-omit-frame-pointer" C_HAS_OMIT_FRAME_POINTER)
 check_cxx_compiler_flag("-fno-omit-frame-pointer" CXX_HAS_OMIT_FRAME_POINTER)
 

diff  --git a/openmp/cmake/OpenMPTesting.cmake b/openmp/cmake/OpenMPTesting.cmake
index 1a9e0ded01aa2..a93f7199ed7a7 100644
--- a/openmp/cmake/OpenMPTesting.cmake
+++ b/openmp/cmake/OpenMPTesting.cmake
@@ -154,8 +154,7 @@ else()
     set(OPENMP_TEST_COMPILER_HAS_TSAN_FLAGS 0)
   endif()
   set(OPENMP_TEST_COMPILER_HAS_OMP_H 1)
-  # TODO: Implement blockaddress in GlobalISel and remove this flag!
-  set(OPENMP_TEST_COMPILER_OPENMP_FLAGS "-fopenmp ${OPENMP_TEST_COMPILER_THREAD_FLAGS} -fno-experimental-isel")
+  set(OPENMP_TEST_COMPILER_OPENMP_FLAGS "-fopenmp ${OPENMP_TEST_COMPILER_THREAD_FLAGS}")
   set(OPENMP_TEST_COMPILER_HAS_OMIT_FRAME_POINTER_FLAGS 1)
 endif()