[NFC] Reorganization of the nightly target tests (part 1) (NVIDIA#851)

* Reorganize the tests. This moves target tests into their own directory tree. This fixes the following issues. - tests being run more than once in regression tests - test names having to be hardcoded into scripts - the closed selection of new tests on backend simulators * Workaround the aggressive code format checking. * Remove another format check.
SukeshRondla · Nov 2, 2023 · 5117efc · 5117efc
1 parent 717a224
commit 5117efc
Show file tree

Hide file tree

Showing 65 changed files with 71 additions and 6 deletions.
diff --git a/targettests/ionq/bug_qubit.cpp b/targettests/ionq/bug_qubit.cpp
@@ -0,0 +1 @@
+../../test/NVQPP/bug_qubit.cpp
diff --git a/targettests/ionq/callable_kernel_arg.cpp b/targettests/ionq/callable_kernel_arg.cpp
@@ -0,0 +1 @@
+../../test/NVQPP/callable_kernel_arg.cpp
diff --git a/targettests/ionq/graph_coloring-1.cpp b/targettests/ionq/graph_coloring-1.cpp
@@ -0,0 +1 @@
+../../test/NVQPP/graph_coloring-1.cpp
diff --git a/targettests/ionq/graph_coloring.cpp b/targettests/ionq/graph_coloring.cpp
@@ -0,0 +1 @@
+../../test/NVQPP/graph_coloring.cpp
diff --git a/targettests/ionq/if_jit.cpp b/targettests/ionq/if_jit.cpp
@@ -0,0 +1 @@
+../../test/NVQPP/if_jit.cpp
diff --git a/targettests/ionq/load_value.cpp b/targettests/ionq/load_value.cpp
@@ -0,0 +1 @@
+../../test/NVQPP/load_value.cpp
diff --git a/targettests/ionq/qspan_slices.cpp b/targettests/ionq/qspan_slices.cpp
@@ -0,0 +1 @@
+../../test/NVQPP/qspan_slices.cpp
diff --git a/targettests/ionq/sudoku_2x2-1.cpp b/targettests/ionq/sudoku_2x2-1.cpp
@@ -0,0 +1 @@
+../../test/NVQPP/sudoku_2x2-1.cpp
diff --git a/targettests/ionq/sudoku_2x2-bit_names.cpp b/targettests/ionq/sudoku_2x2-bit_names.cpp
@@ -0,0 +1 @@
+../../test/NVQPP/sudoku_2x2-bit_names.cpp
diff --git a/targettests/ionq/sudoku_2x2-reg_name.cpp b/targettests/ionq/sudoku_2x2-reg_name.cpp
@@ -0,0 +1 @@
+../../test/NVQPP/sudoku_2x2-reg_name.cpp
diff --git a/targettests/ionq/sudoku_2x2.cpp b/targettests/ionq/sudoku_2x2.cpp
@@ -0,0 +1 @@
+../../test/NVQPP/sudoku_2x2.cpp
diff --git a/targettests/ionq/swap_gate.cpp b/targettests/ionq/swap_gate.cpp
@@ -0,0 +1 @@
+../../test/NVQPP/swap_gate.cpp
diff --git a/targettests/ionq/test-int8_t.cpp b/targettests/ionq/test-int8_t.cpp
@@ -0,0 +1 @@
+../../test/NVQPP/int8_t.cpp
diff --git a/targettests/ionq/test-int8_t_free_func.cpp b/targettests/ionq/test-int8_t_free_func.cpp
@@ -0,0 +1 @@
+../../test/NVQPP/int8_t_free_func.cpp
diff --git a/targettests/ionq/test-observe.cpp b/targettests/ionq/test-observe.cpp
@@ -0,0 +1 @@
+../../test/NVQPP/cudaq_observe.cpp
diff --git a/targettests/ionq/variable_size_qreg.cpp b/targettests/ionq/variable_size_qreg.cpp
@@ -0,0 +1 @@
+../../test/NVQPP/variable_size_qreg.cpp
diff --git a/targettests/iqm/bug_qubit.cpp b/targettests/iqm/bug_qubit.cpp
@@ -0,0 +1 @@
+../../test/NVQPP/bug_qubit.cpp
diff --git a/targettests/iqm/callable_kernel_arg.cpp b/targettests/iqm/callable_kernel_arg.cpp
@@ -0,0 +1 @@
+../../test/NVQPP/callable_kernel_arg.cpp
diff --git a/targettests/iqm/if_jit.cpp b/targettests/iqm/if_jit.cpp
@@ -0,0 +1 @@
+../../test/NVQPP/if_jit.cpp
diff --git a/targettests/iqm/load_value.cpp b/targettests/iqm/load_value.cpp
@@ -0,0 +1 @@
+../../test/NVQPP/load_value.cpp
diff --git a/targettests/iqm/swap_gate.cpp b/targettests/iqm/swap_gate.cpp
@@ -0,0 +1 @@
+../../test/NVQPP/swap_gate.cpp
diff --git a/targettests/iqm/test-int8_t.cpp b/targettests/iqm/test-int8_t.cpp
@@ -0,0 +1 @@
+../../test/NVQPP/int8_t.cpp
diff --git a/targettests/iqm/test-int8_t_free_func.cpp b/targettests/iqm/test-int8_t_free_func.cpp
@@ -0,0 +1 @@
+../../test/NVQPP/int8_t_free_func.cpp
diff --git a/targettests/iqm/variable_size_qreg.cpp b/targettests/iqm/variable_size_qreg.cpp
@@ -0,0 +1 @@
+../../test/NVQPP/variable_size_qreg.cpp
diff --git a/targettests/oqc/bug_qubit.cpp b/targettests/oqc/bug_qubit.cpp
@@ -0,0 +1 @@
+../../test/NVQPP/bug_qubit.cpp
diff --git a/targettests/oqc/callable_kernel_arg.cpp b/targettests/oqc/callable_kernel_arg.cpp
@@ -0,0 +1 @@
+../../test/NVQPP/callable_kernel_arg.cpp
diff --git a/targettests/oqc/if_jit.cpp b/targettests/oqc/if_jit.cpp
@@ -0,0 +1 @@
+../../test/NVQPP/if_jit.cpp
diff --git a/targettests/oqc/load_value.cpp b/targettests/oqc/load_value.cpp
@@ -0,0 +1 @@
+../../test/NVQPP/load_value.cpp
diff --git a/targettests/oqc/swap_gate.cpp b/targettests/oqc/swap_gate.cpp
@@ -0,0 +1 @@
+../../test/NVQPP/swap_gate.cpp
diff --git a/targettests/oqc/test-int8_t.cpp b/targettests/oqc/test-int8_t.cpp
@@ -0,0 +1 @@
+../../test/NVQPP/int8_t.cpp
diff --git a/targettests/oqc/test-int8_t_free_func.cpp b/targettests/oqc/test-int8_t_free_func.cpp
@@ -0,0 +1 @@
+../../test/NVQPP/int8_t_free_func.cpp
diff --git a/targettests/oqc/variable_size_qreg.cpp b/targettests/oqc/variable_size_qreg.cpp
@@ -0,0 +1 @@
+../../test/NVQPP/variable_size_qreg.cpp
diff --git a/targettests/quantinuum/bug_qubit.cpp b/targettests/quantinuum/bug_qubit.cpp
@@ -0,0 +1 @@
+../../test/NVQPP/bug_qubit.cpp
diff --git a/targettests/quantinuum/callable_kernel_arg.cpp b/targettests/quantinuum/callable_kernel_arg.cpp
@@ -0,0 +1 @@
+../../test/NVQPP/callable_kernel_arg.cpp
diff --git a/targettests/quantinuum/graph_coloring-1.cpp b/targettests/quantinuum/graph_coloring-1.cpp
@@ -0,0 +1 @@
+../../test/NVQPP/graph_coloring-1.cpp
diff --git a/targettests/quantinuum/graph_coloring.cpp b/targettests/quantinuum/graph_coloring.cpp
@@ -0,0 +1 @@
+../../test/NVQPP/graph_coloring.cpp
diff --git a/targettests/quantinuum/if_jit.cpp b/targettests/quantinuum/if_jit.cpp
@@ -0,0 +1 @@
+../../test/NVQPP/if_jit.cpp
diff --git a/targettests/quantinuum/load_value.cpp b/targettests/quantinuum/load_value.cpp
@@ -0,0 +1 @@
+../../test/NVQPP/load_value.cpp
diff --git a/targettests/quantinuum/qspan_slices.cpp b/targettests/quantinuum/qspan_slices.cpp
@@ -0,0 +1 @@
+../../test/NVQPP/qspan_slices.cpp
diff --git a/targettests/quantinuum/sudoku_2x2-1.cpp b/targettests/quantinuum/sudoku_2x2-1.cpp
@@ -0,0 +1 @@
+../../test/NVQPP/sudoku_2x2-1.cpp
diff --git a/targettests/quantinuum/sudoku_2x2-bit_names.cpp b/targettests/quantinuum/sudoku_2x2-bit_names.cpp
@@ -0,0 +1 @@
+../../test/NVQPP/sudoku_2x2-bit_names.cpp
diff --git a/targettests/quantinuum/sudoku_2x2-reg_name.cpp b/targettests/quantinuum/sudoku_2x2-reg_name.cpp
@@ -0,0 +1 @@
+../../test/NVQPP/sudoku_2x2-reg_name.cpp
diff --git a/targettests/quantinuum/sudoku_2x2.cpp b/targettests/quantinuum/sudoku_2x2.cpp
@@ -0,0 +1 @@
+../../test/NVQPP/sudoku_2x2.cpp
diff --git a/targettests/quantinuum/swap_gate.cpp b/targettests/quantinuum/swap_gate.cpp
@@ -0,0 +1 @@
+../../test/NVQPP/swap_gate.cpp
diff --git a/targettests/quantinuum/test-int8_t.cpp b/targettests/quantinuum/test-int8_t.cpp
@@ -0,0 +1 @@
+../../test/NVQPP/int8_t.cpp
diff --git a/targettests/quantinuum/test-int8_t_free_func.cpp b/targettests/quantinuum/test-int8_t_free_func.cpp
@@ -0,0 +1 @@
+../../test/NVQPP/int8_t_free_func.cpp
diff --git a/targettests/quantinuum/test-observe.cpp b/targettests/quantinuum/test-observe.cpp
@@ -0,0 +1 @@
+../../test/NVQPP/cudaq_observe.cpp
diff --git a/targettests/quantinuum/testConditionalSample.cpp b/targettests/quantinuum/testConditionalSample.cpp
@@ -0,0 +1 @@
+../../test/NVQPP/conditional_sample.cpp
diff --git a/targettests/quantinuum/variable_size_qreg.cpp b/targettests/quantinuum/variable_size_qreg.cpp
@@ -0,0 +1 @@
+../../test/NVQPP/variable_size_qreg.cpp
diff --git a/test/NVQPP/bug_qubit.cpp b/test/NVQPP/bug_qubit.cpp
@@ -8,6 +8,7 @@
 
 // This code is from Issue 251.
 
+// clang-format off
 // RUN: nvq++ --enable-mlir -v %s --target quantinuum --emulate -o %t.x && %t.x | FileCheck %s
 // RUN: cudaq-quake %s | cudaq-opt --promote-qubit-allocation | FileCheck --check-prefixes=MLIR %s
 
@@ -38,4 +39,4 @@ int main() {
   return 0;
 }
 
-// CHECK: 1
+// CHECK: 1
diff --git a/test/NVQPP/callable_kernel_arg.cpp b/test/NVQPP/callable_kernel_arg.cpp
@@ -6,6 +6,7 @@
  * the terms of the Apache License 2.0 which accompanies this distribution.    *
  ******************************************************************************/
 
+// clang-format off
 // RUN: nvq++ %s -o %basename_t.x --target quantinuum --emulate && ./%basename_t.x | FileCheck %s
 
 #include <cudaq.h>

diff --git a/test/NVQPP/conditional_sample.cpp b/test/NVQPP/conditional_sample.cpp
@@ -6,6 +6,7 @@
  * the terms of the Apache License 2.0 which accompanies this distribution.    *
  ******************************************************************************/
 
+// clang-format off
 // RUN: nvq++ --enable-mlir %s -o %basename_t.x && ./%basename_t.x
 // RUN: nvq++ --target quantinuum --emulate %s -o %basename_t.x && ./%basename_t.x
 

diff --git a/test/NVQPP/cudaq_observe.cpp b/test/NVQPP/cudaq_observe.cpp
@@ -6,6 +6,7 @@
  * the terms of the Apache License 2.0 which accompanies this distribution.    *
  ******************************************************************************/
 
+// clang-format off
 // RUN: nvq++ %s -o %basename_t.x --target quantinuum --emulate && ./%basename_t.x | FileCheck %s
 
 // 2 different IQM machines for 2 different topologies

diff --git a/test/NVQPP/graph_coloring-1.cpp b/test/NVQPP/graph_coloring-1.cpp
@@ -6,6 +6,7 @@
  * the terms of the Apache License 2.0 which accompanies this distribution.    *
  ******************************************************************************/
 
+// clang-format off
 // RUN: nvq++ -v %s -o %basename_t.x --target quantinuum --emulate && ./%basename_t.x | FileCheck %s
 
 #include <cudaq.h>

diff --git a/test/NVQPP/graph_coloring.cpp b/test/NVQPP/graph_coloring.cpp
@@ -6,6 +6,7 @@
  * the terms of the Apache License 2.0 which accompanies this distribution.    *
  ******************************************************************************/
 
+// clang-format off
 // RUN: nvq++ -v %s -o %basename_t.x --target quantinuum --emulate && ./%basename_t.x | FileCheck %s
 
 #include <cudaq.h>

diff --git a/test/NVQPP/int8_t.cpp b/test/NVQPP/int8_t.cpp
@@ -6,6 +6,7 @@
  * the terms of the Apache License 2.0 which accompanies this distribution.    *
  ******************************************************************************/
 
+// clang-format off
 // RUN: nvq++ -v %s -o %basename_t.x --target quantinuum --emulate && ./%basename_t.x | FileCheck %s
 
 #include <cudaq.h>
@@ -35,4 +36,4 @@ int main() {
 // CHECK: 0
 // CHECK: 00
 // CHECK: 000
-// CHECK: 0000
+// CHECK: 0000
diff --git a/test/NVQPP/int8_t_free_func.cpp b/test/NVQPP/int8_t_free_func.cpp
@@ -6,6 +6,7 @@
  * the terms of the Apache License 2.0 which accompanies this distribution.    *
  ******************************************************************************/
 
+// clang-format off
 // RUN: nvq++ --target quantinuum --emulate %s -o %basename_t.x && ./%basename_t.x | FileCheck %s
 
 #include <cudaq.h>

diff --git a/test/NVQPP/load_value.cpp b/test/NVQPP/load_value.cpp
@@ -6,6 +6,7 @@
  * the terms of the Apache License 2.0 which accompanies this distribution.    *
  ******************************************************************************/
 
+// clang-format off
 // RUN: nvq++ %s -o %basename_t.x --target quantinuum --emulate && ./%basename_t.x | FileCheck %s
 // RUN: nvq++ %s -o %basename_t.x --target iqm --iqm-machine Adonis --emulate && ./%basename_t.x | FileCheck %s
 // RUN: nvq++ %s -o %basename_t.x --target iqm --iqm-machine Apollo --emulate && ./%basename_t.x | FileCheck %s

diff --git a/test/NVQPP/qspan_slices.cpp b/test/NVQPP/qspan_slices.cpp
@@ -6,6 +6,7 @@
  * the terms of the Apache License 2.0 which accompanies this distribution.    *
  ******************************************************************************/
 
+// clang-format off
 // RUN: nvq++ -v %s -o %basename_t.x --target quantinuum --emulate && ./%basename_t.x | FileCheck %s
 // RUN: nvq++ -v %s -o %basename_t.x --target iqm --iqm-machine Adonis --emulate && ./%basename_t.x | FileCheck %s
 

diff --git a/test/NVQPP/sudoku_2x2-1.cpp b/test/NVQPP/sudoku_2x2-1.cpp
@@ -6,6 +6,7 @@
  * the terms of the Apache License 2.0 which accompanies this distribution.    *
  ******************************************************************************/
 
+// clang-format off
 // RUN: nvq++ -v %s -o %basename_t.x --target quantinuum --emulate && ./%basename_t.x | FileCheck %s
 
 #include <cudaq.h>

diff --git a/test/NVQPP/sudoku_2x2-bit_names.cpp b/test/NVQPP/sudoku_2x2-bit_names.cpp
@@ -6,6 +6,7 @@
  * the terms of the Apache License 2.0 which accompanies this distribution.    *
  ******************************************************************************/
 
+// clang-format off
 // RUN: nvq++ -v %s -o %basename_t.x --target quantinuum --emulate && ./%basename_t.x | FileCheck %s
 
 #include <cudaq.h>
@@ -91,4 +92,4 @@ int main() {
 }
 
 // CHECK-DAG: 1001
-// CHECK-DAG: 0110
+// CHECK-DAG: 0110
diff --git a/test/NVQPP/sudoku_2x2-reg_name.cpp b/test/NVQPP/sudoku_2x2-reg_name.cpp
@@ -6,6 +6,7 @@
  * the terms of the Apache License 2.0 which accompanies this distribution.    *
  ******************************************************************************/
 
+// clang-format off
 // RUN: nvq++ -v %s -o %basename_t.x --target quantinuum --emulate && ./%basename_t.x | FileCheck %s
 
 #include <cudaq.h>
@@ -67,4 +68,4 @@ int main() {
 }
 
 // CHECK-DAG: 1001
-// CHECK-DAG: 0110
+// CHECK-DAG: 0110
diff --git a/test/NVQPP/sudoku_2x2.cpp b/test/NVQPP/sudoku_2x2.cpp
@@ -6,6 +6,7 @@
  * the terms of the Apache License 2.0 which accompanies this distribution.    *
  ******************************************************************************/
 
+// clang-format off
 // RUN: nvq++ -v %s -o %basename_t.x --target quantinuum --emulate && ./%basename_t.x | FileCheck %s
 
 #include <cudaq.h>
@@ -66,4 +67,4 @@ int main() {
 }
 
 // CHECK-DAG: 1001
-// CHECK-DAG: 0110
+// CHECK-DAG: 0110
diff --git a/test/NVQPP/swap_gate.cpp b/test/NVQPP/swap_gate.cpp
@@ -6,6 +6,7 @@
  * the terms of the Apache License 2.0 which accompanies this distribution.    *
  ******************************************************************************/
 
+// clang-format off
 // RUN: nvq++ -v %s -o %basename_t.x --target quantinuum --emulate && ./%basename_t.x | FileCheck %s
 
 #include "cudaq.h"
@@ -31,4 +32,4 @@ int main() {
   return 0;
 }
 
-// CHECK: 01
+// CHECK: 01
diff --git a/test/NVQPP/variable_size_qreg.cpp b/test/NVQPP/variable_size_qreg.cpp
@@ -6,6 +6,7 @@
  * the terms of the Apache License 2.0 which accompanies this distribution.    *
  ******************************************************************************/
 
+// clang-format off
 // RUN: nvq++ -v %s -o %basename_t.x --target quantinuum --emulate && ./%basename_t.x | FileCheck %s
 
 #include <cudaq.h>