[llvm] 43b8e86 - [llvm-exegesis] enable memory annotation and subprocess tests

[Aiden Grossman via llvm-commits]

Author: Aiden Grossman
Date: 2023-08-04T20:56:40-07:00
New Revision: 43b8e86bf76648bf0f34f34bc0a606e527decc43

URL: https://github.com/llvm/llvm-project/commit/43b8e86bf76648bf0f34f34bc0a606e527decc43
DIFF: https://github.com/llvm/llvm-project/commit/43b8e86bf76648bf0f34f34bc0a606e527decc43.diff

LOG: [llvm-exegesis] enable memory annotation and subprocess tests

These tests were causing issues on the clang-cmake-x86_64-avx512-linux
builder due to transient failures. I'm unable to reproduce the issue
locally now, so we'll see what happens. There were a couple changes in
between disabling them and now that might have an impact.

Added: 
    

Modified: 
    llvm/test/tools/llvm-exegesis/X86/latency/memory-annotations-livein.s
    llvm/test/tools/llvm-exegesis/X86/latency/memory-annotations.s
    llvm/test/tools/llvm-exegesis/X86/latency/subprocess-abnormal-exit-code.s
    llvm/test/tools/llvm-exegesis/X86/latency/subprocess-segfault.s
    llvm/test/tools/llvm-exegesis/X86/latency/subprocess.s
    llvm/test/tools/llvm-exegesis/lit.local.cfg

Removed: 
    


################################################################################
diff  --git a/llvm/test/tools/llvm-exegesis/X86/latency/memory-annotations-livein.s b/llvm/test/tools/llvm-exegesis/X86/latency/memory-annotations-livein.s
index 4c75573f919fdd..51b48c933efc06 100644
--- a/llvm/test/tools/llvm-exegesis/X86/latency/memory-annotations-livein.s
+++ b/llvm/test/tools/llvm-exegesis/X86/latency/memory-annotations-livein.s
@@ -1,4 +1,4 @@
-# REQUIRES: exegesis-can-execute-in-subprocess, x86_64-linux
+# REQUIRES: exegesis-can-measure-latency, x86_64-linux
 
 # Test that we can use the subprocess executor mode with memory annotations
 # while having live-ins still work as expected.

diff  --git a/llvm/test/tools/llvm-exegesis/X86/latency/memory-annotations.s b/llvm/test/tools/llvm-exegesis/X86/latency/memory-annotations.s
index a1744eeeee5160..04f79ad919d6df 100644
--- a/llvm/test/tools/llvm-exegesis/X86/latency/memory-annotations.s
+++ b/llvm/test/tools/llvm-exegesis/X86/latency/memory-annotations.s
@@ -1,4 +1,4 @@
-# REQUIRES: exegesis-can-execute-in-subprocess, x86_64-linux
+# REQUIRES: exegesis-can-measure-latency, x86_64-linux
 
 # Test the basic functionality of memory annotations, namely that we can
 # specify a memory definition, map it into the process, and then use the

diff  --git a/llvm/test/tools/llvm-exegesis/X86/latency/subprocess-abnormal-exit-code.s b/llvm/test/tools/llvm-exegesis/X86/latency/subprocess-abnormal-exit-code.s
index fbc28df1f234e9..849f1a2e552f18 100644
--- a/llvm/test/tools/llvm-exegesis/X86/latency/subprocess-abnormal-exit-code.s
+++ b/llvm/test/tools/llvm-exegesis/X86/latency/subprocess-abnormal-exit-code.s
@@ -1,4 +1,4 @@
-# REQUIRES: exegesis-can-execute-in-subprocess, x86_64-linux
+# REQUIRES: exegesis-can-measure-latency, x86_64-linux
 
 # RUN: llvm-exegesis -mtriple=x86_64-unknown-unknown -mode=latency -snippets-file=%s -execution-mode=subprocess | FileCheck %s
 

diff  --git a/llvm/test/tools/llvm-exegesis/X86/latency/subprocess-segfault.s b/llvm/test/tools/llvm-exegesis/X86/latency/subprocess-segfault.s
index 5ca0a8b2109c01..92b08e1c18c62e 100644
--- a/llvm/test/tools/llvm-exegesis/X86/latency/subprocess-segfault.s
+++ b/llvm/test/tools/llvm-exegesis/X86/latency/subprocess-segfault.s
@@ -1,4 +1,4 @@
-# REQUIRES: exegesis-can-execute-in-subprocess, x86_64-linux
+# REQUIRES: exegesis-can-measure-latency, x86_64-linux
 
 # RUN: llvm-exegesis -mtriple=x86_64-unknown-unknown -mode=latency -snippets-file=%s -execution-mode=subprocess | FileCheck %s
 

diff  --git a/llvm/test/tools/llvm-exegesis/X86/latency/subprocess.s b/llvm/test/tools/llvm-exegesis/X86/latency/subprocess.s
index 667a44d1c9e1cb..272780af02409e 100644
--- a/llvm/test/tools/llvm-exegesis/X86/latency/subprocess.s
+++ b/llvm/test/tools/llvm-exegesis/X86/latency/subprocess.s
@@ -1,4 +1,4 @@
-# REQUIRES: exegesis-can-execute-in-subprocess, x86_64-linux
+# REQUIRES: exegesis-can-measure-latency, x86_64-linux
 
 # RUN: llvm-exegesis -mtriple=x86_64-unknown-unknown -mode=latency -snippets-file=%s -execution-mode=subprocess | FileCheck %s
 

diff  --git a/llvm/test/tools/llvm-exegesis/lit.local.cfg b/llvm/test/tools/llvm-exegesis/lit.local.cfg
index b09003d1e23591..a51a2d73442fa0 100644
--- a/llvm/test/tools/llvm-exegesis/lit.local.cfg
+++ b/llvm/test/tools/llvm-exegesis/lit.local.cfg
@@ -48,8 +48,3 @@ if can_execute_generated_snippets("x86_64"):
     ):
         config.available_features.add("exegesis-can-measure-latency-lbr")
 
-# The subprocess tests are flaky on some of the builders that support them, so
-# they are disabled currently.
-#if True:
-#    config.available_features.add("exegesis-can-execute-in-subprocess")
-