From 1ee01bc4c9af52d45e09d5df8febf30d2f27fadb Mon Sep 17 00:00:00 2001 From: Christian Ulmann Date: Tue, 6 Sep 2022 18:47:28 +0200 Subject: [PATCH] [HandshakeRunner][lit] Move tests to integration test (#3826) The handshake-runner tests take a large amount of time and do execute their input. Thus, it makes more sense to have them as part of the integration tests. --- {test => integration_test}/handshake-runner/call_bb.mlir | 0 .../handshake-runner/call_controlflow.mlir | 0 {test => integration_test}/handshake-runner/cdiv-old-std.mlir | 0 {test => integration_test}/handshake-runner/cdiv-std.mlir | 0 {test => integration_test}/handshake-runner/complex_bb.mlir | 0 .../handshake-runner/floydwarshall-std.mlir | 0 .../handshake-runner/histogram-std.mlir | 0 {test => integration_test}/handshake-runner/loadstore.mlir | 0 .../handshake-runner/loop-check-1-std.mlir | 0 .../handshake-runner/loop-check-2-std.mlir | 0 .../handshake-runner/matmul-check-std.mlir | 0 {test => integration_test}/handshake-runner/matmul-std.mlir | 0 .../handshake-runner/memory_simple_2_std.mlir | 0 .../handshake-runner/memory_simple_std.mlir | 0 {test => integration_test}/handshake-runner/simple_loop.mlir | 0 .../handshake-runner/simple_loop_buffered.mlir | 0 .../handshake-runner/simple_tuple_ops.mlir | 0 integration_test/lit.cfg.py | 2 +- test/lit.cfg.py | 4 ++-- 19 files changed, 3 insertions(+), 3 deletions(-) rename {test => integration_test}/handshake-runner/call_bb.mlir (100%) rename {test => integration_test}/handshake-runner/call_controlflow.mlir (100%) rename {test => integration_test}/handshake-runner/cdiv-old-std.mlir (100%) rename {test => integration_test}/handshake-runner/cdiv-std.mlir (100%) rename {test => integration_test}/handshake-runner/complex_bb.mlir (100%) rename {test => integration_test}/handshake-runner/floydwarshall-std.mlir (100%) rename {test => integration_test}/handshake-runner/histogram-std.mlir (100%) rename {test => integration_test}/handshake-runner/loadstore.mlir (100%) rename {test => integration_test}/handshake-runner/loop-check-1-std.mlir (100%) rename {test => integration_test}/handshake-runner/loop-check-2-std.mlir (100%) rename {test => integration_test}/handshake-runner/matmul-check-std.mlir (100%) rename {test => integration_test}/handshake-runner/matmul-std.mlir (100%) rename {test => integration_test}/handshake-runner/memory_simple_2_std.mlir (100%) rename {test => integration_test}/handshake-runner/memory_simple_std.mlir (100%) rename {test => integration_test}/handshake-runner/simple_loop.mlir (100%) rename {test => integration_test}/handshake-runner/simple_loop_buffered.mlir (100%) rename {test => integration_test}/handshake-runner/simple_tuple_ops.mlir (100%) diff --git a/test/handshake-runner/call_bb.mlir b/integration_test/handshake-runner/call_bb.mlir similarity index 100% rename from test/handshake-runner/call_bb.mlir rename to integration_test/handshake-runner/call_bb.mlir diff --git a/test/handshake-runner/call_controlflow.mlir b/integration_test/handshake-runner/call_controlflow.mlir similarity index 100% rename from test/handshake-runner/call_controlflow.mlir rename to integration_test/handshake-runner/call_controlflow.mlir diff --git a/test/handshake-runner/cdiv-old-std.mlir b/integration_test/handshake-runner/cdiv-old-std.mlir similarity index 100% rename from test/handshake-runner/cdiv-old-std.mlir rename to integration_test/handshake-runner/cdiv-old-std.mlir diff --git a/test/handshake-runner/cdiv-std.mlir b/integration_test/handshake-runner/cdiv-std.mlir similarity index 100% rename from test/handshake-runner/cdiv-std.mlir rename to integration_test/handshake-runner/cdiv-std.mlir diff --git a/test/handshake-runner/complex_bb.mlir b/integration_test/handshake-runner/complex_bb.mlir similarity index 100% rename from test/handshake-runner/complex_bb.mlir rename to integration_test/handshake-runner/complex_bb.mlir diff --git a/test/handshake-runner/floydwarshall-std.mlir b/integration_test/handshake-runner/floydwarshall-std.mlir similarity index 100% rename from test/handshake-runner/floydwarshall-std.mlir rename to integration_test/handshake-runner/floydwarshall-std.mlir diff --git a/test/handshake-runner/histogram-std.mlir b/integration_test/handshake-runner/histogram-std.mlir similarity index 100% rename from test/handshake-runner/histogram-std.mlir rename to integration_test/handshake-runner/histogram-std.mlir diff --git a/test/handshake-runner/loadstore.mlir b/integration_test/handshake-runner/loadstore.mlir similarity index 100% rename from test/handshake-runner/loadstore.mlir rename to integration_test/handshake-runner/loadstore.mlir diff --git a/test/handshake-runner/loop-check-1-std.mlir b/integration_test/handshake-runner/loop-check-1-std.mlir similarity index 100% rename from test/handshake-runner/loop-check-1-std.mlir rename to integration_test/handshake-runner/loop-check-1-std.mlir diff --git a/test/handshake-runner/loop-check-2-std.mlir b/integration_test/handshake-runner/loop-check-2-std.mlir similarity index 100% rename from test/handshake-runner/loop-check-2-std.mlir rename to integration_test/handshake-runner/loop-check-2-std.mlir diff --git a/test/handshake-runner/matmul-check-std.mlir b/integration_test/handshake-runner/matmul-check-std.mlir similarity index 100% rename from test/handshake-runner/matmul-check-std.mlir rename to integration_test/handshake-runner/matmul-check-std.mlir diff --git a/test/handshake-runner/matmul-std.mlir b/integration_test/handshake-runner/matmul-std.mlir similarity index 100% rename from test/handshake-runner/matmul-std.mlir rename to integration_test/handshake-runner/matmul-std.mlir diff --git a/test/handshake-runner/memory_simple_2_std.mlir b/integration_test/handshake-runner/memory_simple_2_std.mlir similarity index 100% rename from test/handshake-runner/memory_simple_2_std.mlir rename to integration_test/handshake-runner/memory_simple_2_std.mlir diff --git a/test/handshake-runner/memory_simple_std.mlir b/integration_test/handshake-runner/memory_simple_std.mlir similarity index 100% rename from test/handshake-runner/memory_simple_std.mlir rename to integration_test/handshake-runner/memory_simple_std.mlir diff --git a/test/handshake-runner/simple_loop.mlir b/integration_test/handshake-runner/simple_loop.mlir similarity index 100% rename from test/handshake-runner/simple_loop.mlir rename to integration_test/handshake-runner/simple_loop.mlir diff --git a/test/handshake-runner/simple_loop_buffered.mlir b/integration_test/handshake-runner/simple_loop_buffered.mlir similarity index 100% rename from test/handshake-runner/simple_loop_buffered.mlir rename to integration_test/handshake-runner/simple_loop_buffered.mlir diff --git a/test/handshake-runner/simple_tuple_ops.mlir b/integration_test/handshake-runner/simple_tuple_ops.mlir similarity index 100% rename from test/handshake-runner/simple_tuple_ops.mlir rename to integration_test/handshake-runner/simple_tuple_ops.mlir diff --git a/integration_test/lit.cfg.py b/integration_test/lit.cfg.py index ddb348459ed4..0864de0193d0 100644 --- a/integration_test/lit.cfg.py +++ b/integration_test/lit.cfg.py @@ -78,7 +78,7 @@ ] tools = [ 'circt-opt', 'circt-translate', 'firtool', 'circt-rtl-sim.py', - 'esi-cosim-runner.py', 'equiv-rtl.sh' + 'esi-cosim-runner.py', 'equiv-rtl.sh', 'handshake-runner' ] # Enable python if its path was configured diff --git a/test/lit.cfg.py b/test/lit.cfg.py index 01cb91cc6574..82272075d029 100644 --- a/test/lit.cfg.py +++ b/test/lit.cfg.py @@ -56,8 +56,8 @@ config.circt_tools_dir, config.mlir_tools_dir, config.llvm_tools_dir ] tools = [ - 'firtool', 'handshake-runner', 'circt-opt', 'circt-reduce', - 'circt-translate', 'circt-capi-ir-test', 'esi-tester' + 'firtool', 'circt-opt', 'circt-reduce', 'circt-translate', + 'circt-capi-ir-test', 'esi-tester' ] # Enable Verilator if it has been detected.