From e463e95e8f6113885db236fb71e15f934763ecd3 Mon Sep 17 00:00:00 2001
From: Alex Bradbury <asb@igalia.com>
Date: Sun, 26 Jan 2025 13:11:19 +0000
Subject: [PATCH 1/2] [MCJIT][test] Move MCJIT non-interpreter tests to MCJIT
 subdirectory

Moving to the MCJIT subdirectory means they can be gated by a common
lit.local.cfg. I remove the `; UNSUPPORTED: target=loongarch{{.*}}`
lines because of this.

The move is motivated by my desire to enable more of these tests for
RISCV, and it seems like it would be wrong to keep extending the
`UNSUPPORTED` lines for these individual tests.

This patch does not move the MCJIT tests in the top-level directory that
do `-force-interpreter=true`.
---
 llvm/test/ExecutionEngine/{ => MCJIT}/fma3-jit.ll              | 0
 llvm/test/ExecutionEngine/{ => MCJIT}/frem.ll                  | 3 ---
 llvm/test/ExecutionEngine/{ => MCJIT}/mov64zext32.ll           | 3 ---
 .../{ => MCJIT}/test-interp-vec-arithm_float.ll                | 3 ---
 .../ExecutionEngine/{ => MCJIT}/test-interp-vec-arithm_int.ll  | 3 ---
 .../ExecutionEngine/{ => MCJIT}/test-interp-vec-logical.ll     | 3 ---
 .../ExecutionEngine/{ => MCJIT}/test-interp-vec-setcond-fp.ll  | 3 ---
 .../ExecutionEngine/{ => MCJIT}/test-interp-vec-setcond-int.ll | 3 ---
 8 files changed, 21 deletions(-)
 rename llvm/test/ExecutionEngine/{ => MCJIT}/fma3-jit.ll (100%)
 rename llvm/test/ExecutionEngine/{ => MCJIT}/frem.ll (90%)
 rename llvm/test/ExecutionEngine/{ => MCJIT}/mov64zext32.ll (77%)
 rename llvm/test/ExecutionEngine/{ => MCJIT}/test-interp-vec-arithm_float.ll (92%)
 rename llvm/test/ExecutionEngine/{ => MCJIT}/test-interp-vec-arithm_int.ll (96%)
 rename llvm/test/ExecutionEngine/{ => MCJIT}/test-interp-vec-logical.ll (91%)
 rename llvm/test/ExecutionEngine/{ => MCJIT}/test-interp-vec-setcond-fp.ll (93%)
 rename llvm/test/ExecutionEngine/{ => MCJIT}/test-interp-vec-setcond-int.ll (97%)

diff --git a/llvm/test/ExecutionEngine/fma3-jit.ll b/llvm/test/ExecutionEngine/MCJIT/fma3-jit.ll
similarity index 100%
rename from llvm/test/ExecutionEngine/fma3-jit.ll
rename to llvm/test/ExecutionEngine/MCJIT/fma3-jit.ll
diff --git a/llvm/test/ExecutionEngine/frem.ll b/llvm/test/ExecutionEngine/MCJIT/frem.ll
similarity index 90%
rename from llvm/test/ExecutionEngine/frem.ll
rename to llvm/test/ExecutionEngine/MCJIT/frem.ll
index d33e4fca876e1..b8739c249cf58 100644
--- a/llvm/test/ExecutionEngine/frem.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/frem.ll
@@ -1,6 +1,3 @@
-; LoongArch does not support mcjit.
-; UNSUPPORTED: target=loongarch{{.*}}
-
 ; LLI.exe used to crash on Windows\X86 when certain single precession
 ; floating point intrinsics (defined as macros) are used.
 ; This unit test guards against the failure.
diff --git a/llvm/test/ExecutionEngine/mov64zext32.ll b/llvm/test/ExecutionEngine/MCJIT/mov64zext32.ll
similarity index 77%
rename from llvm/test/ExecutionEngine/mov64zext32.ll
rename to llvm/test/ExecutionEngine/MCJIT/mov64zext32.ll
index 43bd0fb2f7b43..bba1a1987350a 100644
--- a/llvm/test/ExecutionEngine/mov64zext32.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/mov64zext32.ll
@@ -1,6 +1,3 @@
-; LoongArch does not support mcjit.
-; UNSUPPORTED: target=loongarch{{.*}}
-
 ; RUN: %lli -jit-kind=mcjit %s > /dev/null
 ; RUN: %lli %s > /dev/null
 
diff --git a/llvm/test/ExecutionEngine/test-interp-vec-arithm_float.ll b/llvm/test/ExecutionEngine/MCJIT/test-interp-vec-arithm_float.ll
similarity index 92%
rename from llvm/test/ExecutionEngine/test-interp-vec-arithm_float.ll
rename to llvm/test/ExecutionEngine/MCJIT/test-interp-vec-arithm_float.ll
index 99d95791c5ad2..6f784265a73e1 100644
--- a/llvm/test/ExecutionEngine/test-interp-vec-arithm_float.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/test-interp-vec-arithm_float.ll
@@ -1,6 +1,3 @@
-; LoongArch does not support mcjit.
-; UNSUPPORTED: target=loongarch{{.*}}
-
 ; RUN: %lli -jit-kind=mcjit %s > /dev/null
 ; RUN: %lli %s > /dev/null
 
diff --git a/llvm/test/ExecutionEngine/test-interp-vec-arithm_int.ll b/llvm/test/ExecutionEngine/MCJIT/test-interp-vec-arithm_int.ll
similarity index 96%
rename from llvm/test/ExecutionEngine/test-interp-vec-arithm_int.ll
rename to llvm/test/ExecutionEngine/MCJIT/test-interp-vec-arithm_int.ll
index 2e5592d4d363c..6896af83c44fb 100644
--- a/llvm/test/ExecutionEngine/test-interp-vec-arithm_int.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/test-interp-vec-arithm_int.ll
@@ -1,6 +1,3 @@
-; LoongArch does not support mcjit.
-; UNSUPPORTED: target=loongarch{{.*}}
-
 ; RUN: %lli -jit-kind=mcjit %s > /dev/null
 ; RUN: %lli %s > /dev/null
 
diff --git a/llvm/test/ExecutionEngine/test-interp-vec-logical.ll b/llvm/test/ExecutionEngine/MCJIT/test-interp-vec-logical.ll
similarity index 91%
rename from llvm/test/ExecutionEngine/test-interp-vec-logical.ll
rename to llvm/test/ExecutionEngine/MCJIT/test-interp-vec-logical.ll
index 1e11659b1898a..f654120eaf8e0 100644
--- a/llvm/test/ExecutionEngine/test-interp-vec-logical.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/test-interp-vec-logical.ll
@@ -1,6 +1,3 @@
-; LoongArch does not support mcjit.
-; UNSUPPORTED: target=loongarch{{.*}}
-
 ; RUN: %lli -jit-kind=mcjit %s > /dev/null
 ; RUN: %lli %s > /dev/null
 
diff --git a/llvm/test/ExecutionEngine/test-interp-vec-setcond-fp.ll b/llvm/test/ExecutionEngine/MCJIT/test-interp-vec-setcond-fp.ll
similarity index 93%
rename from llvm/test/ExecutionEngine/test-interp-vec-setcond-fp.ll
rename to llvm/test/ExecutionEngine/MCJIT/test-interp-vec-setcond-fp.ll
index e919550de2689..84bdec1cf5597 100644
--- a/llvm/test/ExecutionEngine/test-interp-vec-setcond-fp.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/test-interp-vec-setcond-fp.ll
@@ -1,6 +1,3 @@
-; LoongArch does not support mcjit.
-; UNSUPPORTED: target=loongarch{{.*}}
-
 ; RUN: %lli -jit-kind=mcjit %s > /dev/null
 ; RUN: %lli %s > /dev/null
 
diff --git a/llvm/test/ExecutionEngine/test-interp-vec-setcond-int.ll b/llvm/test/ExecutionEngine/MCJIT/test-interp-vec-setcond-int.ll
similarity index 97%
rename from llvm/test/ExecutionEngine/test-interp-vec-setcond-int.ll
rename to llvm/test/ExecutionEngine/MCJIT/test-interp-vec-setcond-int.ll
index 9862d6af1f6eb..5a20fc4f11721 100644
--- a/llvm/test/ExecutionEngine/test-interp-vec-setcond-int.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/test-interp-vec-setcond-int.ll
@@ -1,6 +1,3 @@
-; LoongArch does not support mcjit.
-; UNSUPPORTED: target=loongarch{{.*}}
-
 ; RUN: %lli -jit-kind=mcjit %s > /dev/null
 ; RUN: %lli %s > /dev/null
 

From cb71a0045e143e80983c4a34a4a7e45f42075586 Mon Sep 17 00:00:00 2001
From: Alex Bradbury <asb@igalia.com>
Date: Sun, 26 Jan 2025 13:21:56 +0000
Subject: [PATCH 2/2] [ExecutionEngine][test][RISCV] Don't mark RISCV as
 unsupported

Although MCJIT is unsupported, we can and should be running the other
tests. Stacks on top of #124463 (needed to avoid unsupported MCJIT tests
in the top-level test/ExecutionEngine directory running when they
shouldn't).

This effectively reverts b8feeba0b407e703385738af7e415d0c8972a420.

ninja check-llvm-executionengine before:
Total Discovered Tests: 335
  Unsupported: 335 (100.00%)

ninja check-llvm-executionengine after:
Total Discovered Tests: 335
  Unsupported      : 125 (37.31%)
  Passed           : 209 (62.39%)
  Expectedly Failed:   1 (0.30%)
---
 llvm/test/ExecutionEngine/lit.local.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/llvm/test/ExecutionEngine/lit.local.cfg b/llvm/test/ExecutionEngine/lit.local.cfg
index c748de14c8409..1951f140ea889 100644
--- a/llvm/test/ExecutionEngine/lit.local.cfg
+++ b/llvm/test/ExecutionEngine/lit.local.cfg
@@ -1,4 +1,4 @@
-if config.root.native_target in ['Sparc', 'SystemZ', 'Hexagon', 'RISCV']:
+if config.root.native_target in ['Sparc', 'SystemZ', 'Hexagon']:
     config.unsupported = True
 
 # ExecutionEngine tests are not expected to pass in a cross-compilation setup.