[llvm] 30c17e7 - [MLGO] Don't run the 'release' mode tests in non-autogenerated cases

[Mircea Trofin via llvm-commits]

Author: Mircea Trofin
Date: 2022-01-19T17:59:06-08:00
New Revision: 30c17e70a4d75efa2febe61fd9f68e303c3173ea

URL: https://github.com/llvm/llvm-project/commit/30c17e70a4d75efa2febe61fd9f68e303c3173ea
DIFF: https://github.com/llvm/llvm-project/commit/30c17e70a4d75efa2febe61fd9f68e303c3173ea.diff

LOG: [MLGO] Don't run the 'release' mode tests in non-autogenerated cases

Added: 
    

Modified: 
    llvm/test/CMakeLists.txt
    llvm/test/CodeGen/MLRegalloc/dev-rel-equivalence.ll
    llvm/test/CodeGen/MLRegalloc/rel-codepath.ll
    llvm/test/lit.cfg.py
    llvm/test/lit.site.cfg.py.in

Removed: 
    


################################################################################
diff  --git a/llvm/test/CMakeLists.txt b/llvm/test/CMakeLists.txt
index 6dbede4118134..2d18625e86133 100644
--- a/llvm/test/CMakeLists.txt
+++ b/llvm/test/CMakeLists.txt
@@ -19,6 +19,7 @@ llvm_canonicalize_cmake_booleans(
   LLVM_HAVE_TF_AOT
   LLVM_HAVE_TF_API
   LLVM_INLINER_MODEL_AUTOGENERATED
+  LLVM_RAEVICT_MODEL_AUTOGENERATED
   LLVM_ENABLE_EXPENSIVE_CHECKS
   )
 

diff  --git a/llvm/test/CodeGen/MLRegalloc/dev-rel-equivalence.ll b/llvm/test/CodeGen/MLRegalloc/dev-rel-equivalence.ll
index 0dddc899f1db5..cedf19964996d 100644
--- a/llvm/test/CodeGen/MLRegalloc/dev-rel-equivalence.ll
+++ b/llvm/test/CodeGen/MLRegalloc/dev-rel-equivalence.ll
@@ -1,5 +1,6 @@
 ; REQUIRES: have_tf_api
 ; REQUIRES: have_tf_aot
+; REQUIRES: llvm_raevict_model_autogenerated
 ; REQUIRES: x86_64-linux
 ;
 ; Check that the same model (==the autogenerated one) produces the same output

diff  --git a/llvm/test/CodeGen/MLRegalloc/rel-codepath.ll b/llvm/test/CodeGen/MLRegalloc/rel-codepath.ll
index 6547e91d42a68..03866d0add9bc 100644
--- a/llvm/test/CodeGen/MLRegalloc/rel-codepath.ll
+++ b/llvm/test/CodeGen/MLRegalloc/rel-codepath.ll
@@ -1,5 +1,6 @@
 ; REQUIRES: have_tf_aot
 ; REQUIRES: x86_64-linux
+; REQUIRES: llvm_raevict_model_autogenerated
 ;
 ; Check the code path for release mode is correctly taken. It is shared with
 ; development mode, and we separately test the internals of that (logged

diff  --git a/llvm/test/lit.cfg.py b/llvm/test/lit.cfg.py
index 9b80726df5c4a..2b3267ab036bc 100644
--- a/llvm/test/lit.cfg.py
+++ b/llvm/test/lit.cfg.py
@@ -257,6 +257,9 @@ def get_asan_rtlib():
 if config.llvm_inliner_model_autogenerated:
     config.available_features.add("llvm_inliner_model_autogenerated")
 
+if config.llvm_raevict_model_autogenerated:
+    config.available_features.add("llvm_raevict_model_autogenerated")
+
 def have_cxx_shared_library():
     readobj_exe = lit.util.which('llvm-readobj', config.llvm_tools_dir)
     if not readobj_exe:

diff  --git a/llvm/test/lit.site.cfg.py.in b/llvm/test/lit.site.cfg.py.in
index 3f380de646de3..e92cb0caa4e1c 100644
--- a/llvm/test/lit.site.cfg.py.in
+++ b/llvm/test/lit.site.cfg.py.in
@@ -56,6 +56,7 @@ config.linked_bye_extension = @LLVM_BYE_LINK_INTO_TOOLS@
 config.have_tf_aot = @LLVM_HAVE_TF_AOT@
 config.have_tf_api = @LLVM_HAVE_TF_API@
 config.llvm_inliner_model_autogenerated = @LLVM_INLINER_MODEL_AUTOGENERATED@
+config.llvm_raevict_model_autogenerated = @LLVM_RAEVICT_MODEL_AUTOGENERATED@
 config.expensive_checks = @LLVM_ENABLE_EXPENSIVE_CHECKS@
 
 # Support substitution of the tools_dir with user parameters. This is