Merge branch 'llvm:main' into find_compiler_rt

Author: omjavaid

External/CMakeLists.txt

@@ -7,3 +7,4 @@ add_subdirectory(Povray)
 add_subdirectory(SPEC)
 add_subdirectory(skidmarks10)
 add_subdirectory(sollve_vv)
+add_subdirectory(smoke)

External/CUDA/CMakeLists.txt

@@ -47,7 +47,7 @@ set(SUPPORTED_GPU_CUDA_12_0
   sm_60 sm_61 sm_62
   sm_70 sm_72 sm_75
   sm_80 sm_86 sm_87 sm_89
-  sm_90
+  sm_90 sm_90a
 )
 set(SUPPORTED_GPU_CUDA_12_1 ${SUPPORTED_GPU_CUDA_12_0})
 set(SUPPORTED_GPU_CUDA_12_2 ${SUPPORTED_GPU_CUDA_12_1})
@@ -349,7 +349,8 @@ macro(create_cuda_tests)
         # Tell clang to use libc++
         # We also need to add compiler's include path for cxxabi.h
         get_filename_component(_compiler_path ${CMAKE_CXX_COMPILER} DIRECTORY)
-        set(_Stdlib_CPPFLAGS -stdlib=libc++ -I${_compiler_path}/../include/c++/v1 -DSTDLIB_VERSION=2017)
+        set(_Stdlib_CPPFLAGS -stdlib=libc++ -I${_compiler_path}/../include/c++/v1
+            -DSTDLIB_VERSION=2017 -D_ALLOW_UNSUPPORTED_LIBCPP)
         set(_Stdlib_LDFLAGS  -stdlib=libc++)
         set(_Stdlib_Libs libcxx)
         create_cuda_test_variant(${_Std} "${_Cuda_Suffix}-${_Std_Suffix}-libc++")

External/HeCBench/CMakeLists.txt

@@ -8,10 +8,27 @@ option(TEST_SUITE_HECBENCH_FORCE_ALL "Execute all HeCBench tests, even those kno
 set(TEST_SUITE_OFFLOADING_FLAGS --offload-arch=native CACHE STRING "Compiler arguments for OpenMP offloading")
 set(TEST_SUITE_OFFLOADING_LDFLAGS --offload-arch=native CACHE STRING "Linker arguments for OpenMP offloading")
 
-set(TEST_SUITE_HECBENCH_EXPECT_PASS
+set(ALL_LIST_OPTIONS
+  AMD
+  AMD_RUNTIME_REDLIST
+  AMD_COMPILER_REDLIST
+  AMD_REDLIST
+  INTEL
+  INTEL_RUNTIME_REDLIST
+  INTEL_COMPILER_REDLIST
+  INTEL_REDLIST
+  NVIDIA
+  NVIDIA_RUNTIME_REDLIST
+  NVIDIA_COMPILER_REDLIST
+  NVIDIA_REDLIST
+)
+
+set(CHOOSEN_LISTS)
+
+set(NVIDIA
     ace-omp/main.cpp
     1
-    
+
     adam-omp/main.cpp
     1
     1
@@ -30,6 +47,37 @@ set(TEST_SUITE_HECBENCH_EXPECT_PASS
     1
 )
 
+set(NVIDIA_RUNTIME_REDLIST)
+set(NVIDIA_COMPILER_REDLIST)
+
+set(AMD
+    ace-omp/main.cpp
+    1
+
+    adam-omp/main.cpp
+    1
+    1
+    1
+
+    aidw-omp/main.cpp
+    1
+    1
+    1
+
+    aobench-omp/ao.cpp
+    1
+
+    atan2-omp/main.cpp
+    1
+    1
+)
+set(AMD_RUNTIME_REDLIST)
+set(AMD_COMPILER_REDLIST)
+
+set(INTEL)
+set(INTEL_RUNTIME_REDLIST)
+set(INTEL_COMPILER_REDLIST)
+
 function (add_hecbench LANG)
   if (NOT OpenMP_${LANG}_FOUND)
     message(FATAL_ERROR "OpenMP for ${LANG} not found")
@@ -41,12 +89,12 @@ function (add_hecbench LANG)
     get_filename_component(_directory "${_file}" DIRECTORY)
     set(_name "hecbench-${_directory}")
 
-    if (NOT TEST_SUITE_HECBENCH_FORCE_ALL AND NOT "${_file}" IN_LIST TEST_SUITE_HECBENCH_EXPECT_PASS)
+    if (NOT TEST_SUITE_HECBENCH_FORCE_ALL AND NOT "${_file}" IN_LIST CHOOSEN_LISTS)
       message(STATUS "Skipping HeCBench Benchmark ${_file}")
       continue ()
     endif ()
 
-    list(FIND TEST_SUITE_HECBENCH_EXPECT_PASS "${_file}" _index)
+    list(FIND CHOOSEN_LISTS  "${_file}" _index)
     if (${_index} EQUAL -1)
       message(STATUS "Skipping HeCBench Benchmark ${_file}")
       continue ()
@@ -55,7 +103,7 @@ function (add_hecbench LANG)
     set(_args_for_benchmark "")
     set(IN_DIRECTORY FALSE)
 
-    foreach(item IN LISTS TEST_SUITE_HECBENCH_EXPECT_PASS)
+    foreach(item IN LISTS CHOOSEN_LISTS)
       if(item MATCHES ".*-omp.*")
 
         if(IN_DIRECTORY)
@@ -110,7 +158,6 @@ function (add_hecbench LANG)
       message(STATUS "Makefile not found in ${BENCHMARK_DIR}.")
     endif()
 
-
     set(_includedir "${TEST_SUITE_HECBENCH_ROOT}/src/${CFLAGS_INCLUDE}" )
 
     llvm_test_executable(${_name} "${TEST_SUITE_HECBENCH_ROOT}/src/${_file}")
@@ -138,9 +185,56 @@ if (TEST_SUITE_HECBENCH_ROOT AND NOT TEST_SUITE_BENCHMARKING_ONLY)
     return ()
   endif ()
 
+  list(REMOVE_DUPLICATES SYSTEM_GPU)
+  foreach(list_option ${SYSTEM_GPU})
+    string(TOUPPER ${list_option} list_option)
+    if(list_option IN_LIST ALL_LIST_OPTIONS)
+      if(list_option STREQUAL "AMD")
+        list(APPEND CHOOSEN_LISTS ${AMD})
+        message(STATUS "adding AMD")
+      endif()
+      if(list_option STREQUAL "AMD_RUNTIME_REDLIST" OR list_option STREQUAL "AMD_REDLIST")
+        list(APPEND CHOOSEN_LISTS ${AMD_RUNTIME_REDLIST})
+        message(STATUS "adding AMD_RUNTIME_REDLIST")
+      endif()
+      if(list_option STREQUAL "AMD_COMPILER_REDLIST" OR list_option STREQUAL "AMD_REDLIST")
+        list(APPEND CHOOSEN_LISTS ${AMD_COMPILER_REDLIST})
+        message(STATUS "adding AMD_COMPILER_REDLIST")
+      endif()
+      if(list_option STREQUAL "NVIDIA")
+        list(APPEND CHOOSEN_LISTS ${NVIDIA})
+        message(STATUS "adding NVIDIA")
+      endif()
+      if(list_option STREQUAL "NVIDIA_RUNTIME_REDLIST" OR list_option STREQUAL "NVIDIA_REDLIST")
+        list(APPEND CHOOSEN_LISTS ${NVIDIA_RUNTIME_REDLIST})
+        message(STATUS "adding NVIDIA_RUNTIME_REDLIST")
+      endif()
+      if(list_option STREQUAL "NVIDIA_COMPILER_REDLIST" OR list_option STREQUAL "NVIDIA_REDLIST")
+        list(APPEND CHOOSEN_LISTS ${NVIDIA_COMPILER_REDLIST})
+        message(STATUS "adding NVIDIA_COMPILER_REDLIST")
+      endif()
+      if(list_option STREQUAL "INTEL")
+        list(APPEND CHOOSEN_LISTS ${INTEL})
+        message(STATUS "adding INTEL")
+      endif()
+      if(list_option STREQUAL "INTEL_RUNTIME_REDLIST" OR list_option STREQUAL "INTEL_REDLIST")
+        list(APPEND CHOOSEN_LISTS ${INTEL_RUNTIME_REDLIST})
+        message(STATUS "adding INTEL_RUNTIME_REDLIST")
+      endif()
+      if(list_option STREQUAL "INTEL_COMPILER_REDLIST" OR list_option STREQUAL "INTEL_REDLIST")
+        list(APPEND CHOOSEN_LISTS ${INTEL_COMPILER_REDLIST})
+        message(STATUS "adding INTEL_COMPILER_REDLIST")
+      endif()
+    else()
+      message(STATUS "Option is unrecognized (${list_option})")
+    endif()
+  endforeach()
+  #list(REMOVE_DUPLICATES CHOOSEN_LISTS)
+
   foreach (_lang in CXX)
     if (CMAKE_${_lang}_COMPILER)
       add_hecbench(${_lang})
     endif()
   endforeach ()
 endif ()
+

External/HeCBench/README

@@ -5,6 +5,24 @@ This directory contains a CMakeLists.txt for the HeCBench so it can be built as
 of the LLVM test-suite. Its sources are not part of the test-suite but
 have to be fetched separately from https://github.com/zjin-lcf/HeCBench.
 
+The CMakeLists.txt contains internal greenlists and redlists that the user
+must declare which options to use with SYSTEM_GPU. The user is able to
+declare multiple lists to use.
+
+here are all of the options:
+-amd (this is the greenlist that contains tests that passes)
+-amd_runtime_redlist
+-amd_compiler_redlist
+-amd_redlist(this is the combination of both runtime and compiler redlists)
+-nvidia (this is the greenlist that contains tests that passes)
+-nvidia_runtime_redlist
+-nvidia_compiler_redlist
+-nvidia_redlist(this is the combination of both runtime and compiler redlists)
+-intel (this is the greenlist that contains tests that passes)
+-intel_runtime_redlist
+-intel_compiler_redlist
+-intel_redlist(this is the combination of both runtime and compiler redlists)
+
 An example run is:
 
 $ cmake ../llvm-test-suite \
@@ -14,8 +32,9 @@ $ cmake ../llvm-test-suite \
   -DCMAKE_C_COMPILER=${HOME}/install/llvm-project/release/bin/clang     \
   -DCMAKE_CXX_COMPILER=${HOME}/install/llvm-project/release/bin/clang++ \
   -DTEST_SUITE_SUBDIRS=External/HeCBench                              \
-  -DTEST_SUITE_HECBENCH_OFFLOADING_CFLAGS=--offload-arch=native \
-  -DTEST_SUITE_HECBENCH_OFFLOADING_LDFLAGS=--offload-arch=native;-lopenmptarget \
+  -DTEST_SUITE__OFFLOADING_CFLAGS=--offload-arch=native \
+  -DTEST_SUITE_OFFLOADING_LDFLAGS=--offload-arch=native;-lopenmptarget \
+  -DSYSTEM_GPU="amd\;amd_runtime_redlist" \
   -DTEST_SUITE_LIT_FLAGS=-svj1
 
 $ LD_LIBRARY_PATH=${HOME}/install/llvm-project/release/lib ninja check