NVIDIA · schweitzpgi · Feb 16, 2024 · Feb 15, 2024 · Feb 15, 2024 · Feb 15, 2024
@@ -80,10 +80,10 @@ jobs:
             done
           }
 
-          create_output cxx '*.cpp *.h *.hpp :!:test :!:tpls :!:**/nlopt-src/*'
-          create_output cxx_headers '*.h *.hpp :!:test :!:tpls :!:**/nlopt-src/*'
+          create_output cxx '*.cpp *.h *.hpp :!:test :!:targettests :!:tpls :!:**/nlopt-src/*'
+          create_output cxx_headers '*.h *.hpp :!:test :!:targettests :!:tpls :!:**/nlopt-src/*'
           create_output cxx_examples 'docs/sphinx/examples/**/*.cpp'
-          create_output python '*.py :!:python/tests :!:test :!:tpls :!:docs/sphinx/conf.py'
+          create_output python '*.py :!:python/tests :!:test :!:targettests :!:tpls :!:docs/sphinx/conf.py'
           create_output markdown '*.md :!:tpls'
           create_output rst '*.rst :!:tpls'
           echo "json=$(echo $json)" >> $GITHUB_OUTPUT

@@ -80,12 +80,14 @@ jobs:
           run: |
             cd $CUDAQ_REPO_ROOT
             python3 -m pip install iqm-client
-            ctest --output-on-failure --test-dir build -E ctest-nvqpp
+            ctest --output-on-failure --test-dir build -E ctest-nvqpp -E ctest-targettests
             ctest_status=$?
             /opt/llvm/bin/llvm-lit -v --param nvqpp_site_config=build/test/lit.site.cfg.py build/test
             lit_status=$?
-            if [ ! $ctest_status -eq 0 ] || [ ! $lit_status -eq 0 ]; then
-              echo "::error file=test_in_devenv.yml::C++ tests failed (ctest status $ctest_status, llvm-lit status $lit_status)."
+            /opt/llvm/bin/llvm-lit -v --param nvqpp_site_config=build/targettests/lit.site.cfg.py build/targettests
+            targ_status=$?
+            if [ ! $ctest_status -eq 0 ] || [ ! $lit_status -eq 0 ] || [ $targ_status -ne 0 ]; then
+              echo "::error file=test_in_devenv.yml::C++ tests failed (ctest status $ctest_status, llvm-lit status $lit_status, target tests status $targ_status)."
               exit 1
             fi
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -530,6 +530,7 @@ if (CUDAQ_ENABLE_PYTHON)
 endif()
 
 if(CUDAQ_BUILD_TESTS)
+  umbrella_lit_testsuite_begin(check-all)
   set(INSTALL_GTEST OFF)
   add_subdirectory(tpls/googletest-src)
   # Bug in GCC 12 leads to spurious warnings (-Wrestrict)
@@ -544,11 +545,13 @@ if(CUDAQ_BUILD_TESTS)
   endif()
   include(GoogleTest)
   include(CTest)
+  add_subdirectory(test)
   if (NOT CUDAQ_DISABLE_RUNTIME)
+    add_subdirectory(targettests)
     add_subdirectory(unittests)
     add_subdirectory(docs)
   endif()
-  add_subdirectory(test)
+  umbrella_lit_testsuite_end(check-all)
 endif()
 
 if (CUDAQ_BUILD_RELOCATABLE_PACKAGE AND NOT CUDAQ_DISABLE_CPP_FRONTEND) 

diff --git a/docker/build/assets.Dockerfile b/docker/build/assets.Dockerfile
@@ -111,7 +111,7 @@ RUN if [ ! -x "$(command -v nvidia-smi)" ] || [ -z "$(nvidia-smi | egrep -o "CUD
     fi && cd /cuda-quantum && \
     # FIXME: Disabled nlopt doesn't seem to work properly
     # tracked in https://github.com/NVIDIA/cuda-quantum/issues/1103
-    excludes+=" --exclude-regex NloptTester|ctest-nvqpp" && \
+    excludes+=" --exclude-regex NloptTester|ctest-nvqpp|ctest-targettests" && \
     ctest --output-on-failure --test-dir build $excludes
 
 ENV CUDAQ_CPP_STD="c++17"

diff --git a/python/tests/backends/test_IQM.py b/python/tests/backends/test_IQM.py
@@ -53,7 +53,7 @@ def startUpMockServer():
     with os.popen("git rev-parse --show-toplevel") as f:
         git_top = f.read().strip()
         if os.path.isdir(git_top):
-            mapping_file = f"{git_top}/test/Supplemental/Apollo Variant.txt"
+            mapping_file = f"{git_top}/targettests/Supplemental/Apollo Variant.txt"
             kwargs["mapping_file"] = mapping_file
     cudaq.set_target("iqm", url="http://localhost:{}".format(port), **kwargs)
 

diff --git a/targettests/CMakeLists.txt b/targettests/CMakeLists.txt
@@ -0,0 +1,57 @@
+# ============================================================================ #
+# Copyright (c) 2022 - 2023 NVIDIA Corporation & Affiliates.                   #
+# All rights reserved.                                                         #
+#                                                                              #
+# This source code and the accompanying materials are made available under     #
+# the terms of the Apache License 2.0 which accompanies this distribution.     #
+# ============================================================================ #
+
+llvm_canonicalize_cmake_booleans(
+  CUDA_FOUND
+  CUDAQ_TEST_REMOTE_SIM
+)
+
+configure_lit_site_cfg(
+  ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in
+  ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg.py
+  MAIN_CONFIG
+  ${CMAKE_CURRENT_SOURCE_DIR}/lit.cfg.py
+  PATHS
+  ${PATHS_FOR_PLUGINS}
+  )
+
+set(CUDAQ_TEST_PARAMS
+  nvqpp_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg.py)
+
+get_property(test_cudaq_libraries GLOBAL PROPERTY CUDAQ_RUNTIME_LIBS)
+
+set(CUDAQ_TEST_DEPENDS
+    cudaq-opt
+    cudaq-translate
+    CircuitCheck
+    FileCheck
+    cudaq-quake
+    fixup-linkage
+    ${test_cudaq_libraries}
+)
+
+add_custom_target(nvqpp-targettest-depends DEPENDS ${CUDAQ_TEST_DEPENDS})
+set_target_properties(nvqpp-targettest-depends PROPERTIES FOLDER "TargetTests")
+
+add_lit_testsuite(check-targets "Running the end-to-end target tests"
+  ${CMAKE_CURRENT_BINARY_DIR}
+  PARAMS ${CUDAQ_TEST_PARAMS}
+  DEPENDS ${CUDAQ_TEST_DEPENDS}
+)
+set_target_properties(check-targets PROPERTIES FOLDER "TargetTests")
+
+add_lit_testsuites(CUDAQ ${CMAKE_CURRENT_SOURCE_DIR}
+  PARAMS ${CUDAQ_TEST_PARAMS}
+  DEPENDS ${CUDAQ_TEST_DEPENDS}
+  FOLDER "Tests/Subdirectories"
+)
+
+# Add nvqpp tests to the ctest suite
+add_test(NAME ctest-targettests
+  COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target check-targets
+  WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
diff --git a/test/Remote-Sim/args_parsing.cpp → targettests/Remote-Sim/args_parsing.cpp b/test/Remote-Sim/args_parsing.cpp → targettests/Remote-Sim/args_parsing.cpp
diff --git a/test/Remote-Sim/free_func.cpp → targettests/Remote-Sim/free_func.cpp b/test/Remote-Sim/free_func.cpp → targettests/Remote-Sim/free_func.cpp
diff --git a/test/Remote-Sim/get_state.cpp → targettests/Remote-Sim/get_state.cpp b/test/Remote-Sim/get_state.cpp → targettests/Remote-Sim/get_state.cpp
diff --git a/test/Remote-Sim/kernel_builder.cpp → targettests/Remote-Sim/kernel_builder.cpp b/test/Remote-Sim/kernel_builder.cpp → targettests/Remote-Sim/kernel_builder.cpp
diff --git a/test/Remote-Sim/observe.cpp → targettests/Remote-Sim/observe.cpp b/test/Remote-Sim/observe.cpp → targettests/Remote-Sim/observe.cpp
diff --git a/test/Remote-Sim/observe_async.cpp → targettests/Remote-Sim/observe_async.cpp b/test/Remote-Sim/observe_async.cpp → targettests/Remote-Sim/observe_async.cpp
diff --git a/test/Remote-Sim/sample.cpp → targettests/Remote-Sim/sample.cpp b/test/Remote-Sim/sample.cpp → targettests/Remote-Sim/sample.cpp
diff --git a/test/Remote-Sim/sample_async.cpp → targettests/Remote-Sim/sample_async.cpp b/test/Remote-Sim/sample_async.cpp → targettests/Remote-Sim/sample_async.cpp
diff --git a/test/Remote-Sim/unsupport_args.cpp → targettests/Remote-Sim/unsupport_args.cpp b/test/Remote-Sim/unsupport_args.cpp → targettests/Remote-Sim/unsupport_args.cpp
diff --git a/test/Supplemental/Adonis Variant.txt → targettests/Supplemental/Adonis Variant.txt b/test/Supplemental/Adonis Variant.txt → targettests/Supplemental/Adonis Variant.txt
diff --git a/test/Supplemental/Apollo Variant.txt → targettests/Supplemental/Apollo Variant.txt b/test/Supplemental/Apollo Variant.txt → targettests/Supplemental/Apollo Variant.txt
diff --git a/test/Target/IQM/for_loop.cpp → targettests/Target/IQM/for_loop.cpp b/test/Target/IQM/for_loop.cpp → targettests/Target/IQM/for_loop.cpp
diff --git a/test/Target/IQM/z_gate.cpp → targettests/Target/IQM/z_gate.cpp b/test/Target/IQM/z_gate.cpp → targettests/Target/IQM/z_gate.cpp
diff --git a/test/NVQPP/IQPE_conditionals.cpp → targettests/execution/IQPE_conditionals.cpp b/test/NVQPP/IQPE_conditionals.cpp → targettests/execution/IQPE_conditionals.cpp
diff --git a/test/NVQPP/auto_kernel.cpp → targettests/execution/auto_kernel.cpp b/test/NVQPP/auto_kernel.cpp → targettests/execution/auto_kernel.cpp
diff --git a/test/NVQPP/bug_qubit.cpp → targettests/execution/bug_qubit.cpp b/test/NVQPP/bug_qubit.cpp → targettests/execution/bug_qubit.cpp
diff --git a/test/NVQPP/callable_kernel_arg.cpp → ...ettests/execution/callable_kernel_arg.cpp b/test/NVQPP/callable_kernel_arg.cpp → ...ettests/execution/callable_kernel_arg.cpp
diff --git a/test/NVQPP/conditional_sample.cpp → targettests/execution/conditional_sample.cpp b/test/NVQPP/conditional_sample.cpp → targettests/execution/conditional_sample.cpp
diff --git a/test/NVQPP/cudaq_observe.cpp → targettests/execution/cudaq_observe.cpp b/test/NVQPP/cudaq_observe.cpp → targettests/execution/cudaq_observe.cpp
diff --git a/test/NVQPP/custom_pass.cpp → targettests/execution/custom_pass.cpp b/test/NVQPP/custom_pass.cpp → targettests/execution/custom_pass.cpp
diff --git a/test/NVQPP/device_code_loaded.cpp → targettests/execution/device_code_loaded.cpp b/test/NVQPP/device_code_loaded.cpp → targettests/execution/device_code_loaded.cpp
diff --git a/test/NVQPP/global_reg.cpp → targettests/execution/global_reg.cpp b/test/NVQPP/global_reg.cpp → targettests/execution/global_reg.cpp
diff --git a/test/NVQPP/graph_coloring-1.cpp → targettests/execution/graph_coloring-1.cpp b/test/NVQPP/graph_coloring-1.cpp → targettests/execution/graph_coloring-1.cpp
diff --git a/test/NVQPP/graph_coloring.cpp → targettests/execution/graph_coloring.cpp b/test/NVQPP/graph_coloring.cpp → targettests/execution/graph_coloring.cpp
diff --git a/test/NVQPP/if_jit.cpp → targettests/execution/if_jit.cpp b/test/NVQPP/if_jit.cpp → targettests/execution/if_jit.cpp
diff --git a/test/NVQPP/include.cpp → targettests/execution/include.cpp b/test/NVQPP/include.cpp → targettests/execution/include.cpp
diff --git a/test/NVQPP/include/include.h → targettests/execution/include/include.h b/test/NVQPP/include/include.h → targettests/execution/include/include.h
diff --git a/test/NVQPP/int8_t.cpp → targettests/execution/int8_t.cpp b/test/NVQPP/int8_t.cpp → targettests/execution/int8_t.cpp
diff --git a/test/NVQPP/int8_t_free_func.cpp → targettests/execution/int8_t_free_func.cpp b/test/NVQPP/int8_t_free_func.cpp → targettests/execution/int8_t_free_func.cpp
diff --git a/test/NVQPP/kernel_exec.cpp → targettests/execution/kernel_exec.cpp b/test/NVQPP/kernel_exec.cpp → targettests/execution/kernel_exec.cpp
diff --git a/test/NVQPP/lambda_introspection.cpp → ...ttests/execution/lambda_introspection.cpp b/test/NVQPP/lambda_introspection.cpp → ...ttests/execution/lambda_introspection.cpp
diff --git a/test/NVQPP/load_value.cpp → targettests/execution/load_value.cpp b/test/NVQPP/load_value.cpp → targettests/execution/load_value.cpp
diff --git a/test/NVQPP/mapping_test-1.cpp → targettests/execution/mapping_test-1.cpp b/test/NVQPP/mapping_test-1.cpp → targettests/execution/mapping_test-1.cpp
diff --git a/test/NVQPP/mapping_test-2.cpp → targettests/execution/mapping_test-2.cpp b/test/NVQPP/mapping_test-2.cpp → targettests/execution/mapping_test-2.cpp
diff --git a/test/NVQPP/other_introspection.cpp → ...ettests/execution/other_introspection.cpp b/test/NVQPP/other_introspection.cpp → ...ettests/execution/other_introspection.cpp
diff --git a/test/NVQPP/phase_estimation.cpp → targettests/execution/phase_estimation.cpp b/test/NVQPP/phase_estimation.cpp → targettests/execution/phase_estimation.cpp
diff --git a/test/NVQPP/predefined_lib_mode.cpp → ...ettests/execution/predefined_lib_mode.cpp b/test/NVQPP/predefined_lib_mode.cpp → ...ettests/execution/predefined_lib_mode.cpp
diff --git a/test/NVQPP/predefined_mlir_mode.cpp → ...ttests/execution/predefined_mlir_mode.cpp b/test/NVQPP/predefined_mlir_mode.cpp → ...ttests/execution/predefined_mlir_mode.cpp
diff --git a/test/NVQPP/preprocessor_defines.cpp → ...ttests/execution/preprocessor_defines.cpp b/test/NVQPP/preprocessor_defines.cpp → ...ttests/execution/preprocessor_defines.cpp
diff --git a/test/NVQPP/qir_cond_for_break.cpp → targettests/execution/qir_cond_for_break.cpp b/test/NVQPP/qir_cond_for_break.cpp → targettests/execution/qir_cond_for_break.cpp
diff --git a/test/NVQPP/qir_cond_for_loop-1.cpp → ...ettests/execution/qir_cond_for_loop-1.cpp b/test/NVQPP/qir_cond_for_loop-1.cpp → ...ettests/execution/qir_cond_for_loop-1.cpp
diff --git a/test/NVQPP/qir_cond_for_loop-2.cpp → ...ettests/execution/qir_cond_for_loop-2.cpp b/test/NVQPP/qir_cond_for_loop-2.cpp → ...ettests/execution/qir_cond_for_loop-2.cpp
diff --git a/test/NVQPP/qir_cond_for_loop-3.cpp → ...ettests/execution/qir_cond_for_loop-3.cpp b/test/NVQPP/qir_cond_for_loop-3.cpp → ...ettests/execution/qir_cond_for_loop-3.cpp
diff --git a/test/NVQPP/qir_cond_for_loop-4.cpp → ...ettests/execution/qir_cond_for_loop-4.cpp b/test/NVQPP/qir_cond_for_loop-4.cpp → ...ettests/execution/qir_cond_for_loop-4.cpp
diff --git a/test/NVQPP/qir_cond_for_loop-5.cpp → ...ettests/execution/qir_cond_for_loop-5.cpp b/test/NVQPP/qir_cond_for_loop-5.cpp → ...ettests/execution/qir_cond_for_loop-5.cpp
diff --git a/test/NVQPP/qir_cond_for_loop-6.cpp → ...ettests/execution/qir_cond_for_loop-6.cpp b/test/NVQPP/qir_cond_for_loop-6.cpp → ...ettests/execution/qir_cond_for_loop-6.cpp
diff --git a/test/NVQPP/qir_if_base.cpp → targettests/execution/qir_if_base.cpp b/test/NVQPP/qir_if_base.cpp → targettests/execution/qir_if_base.cpp
diff --git a/test/NVQPP/qir_op1_after_measure.cpp → ...tests/execution/qir_op1_after_measure.cpp b/test/NVQPP/qir_op1_after_measure.cpp → ...tests/execution/qir_op1_after_measure.cpp
diff --git a/test/NVQPP/qir_op2_after_measure.cpp → ...tests/execution/qir_op2_after_measure.cpp b/test/NVQPP/qir_op2_after_measure.cpp → ...tests/execution/qir_op2_after_measure.cpp
diff --git a/test/NVQPP/qir_op3_after_measure.cpp → ...tests/execution/qir_op3_after_measure.cpp b/test/NVQPP/qir_op3_after_measure.cpp → ...tests/execution/qir_op3_after_measure.cpp
diff --git a/test/NVQPP/qir_range_err_runtime.cpp → ...tests/execution/qir_range_err_runtime.cpp b/test/NVQPP/qir_range_err_runtime.cpp → ...tests/execution/qir_range_err_runtime.cpp
diff --git a/test/NVQPP/qir_simple_cond-1.cpp → targettests/execution/qir_simple_cond-1.cpp b/test/NVQPP/qir_simple_cond-1.cpp → targettests/execution/qir_simple_cond-1.cpp
diff --git a/test/NVQPP/qir_simple_cond-2.cpp → targettests/execution/qir_simple_cond-2.cpp b/test/NVQPP/qir_simple_cond-2.cpp → targettests/execution/qir_simple_cond-2.cpp
diff --git a/test/NVQPP/qir_string_labels.cpp → targettests/execution/qir_string_labels.cpp b/test/NVQPP/qir_string_labels.cpp → targettests/execution/qir_string_labels.cpp
diff --git a/test/NVQPP/qpp_cpu_target.cpp → targettests/execution/qpp_cpu_target.cpp b/test/NVQPP/qpp_cpu_target.cpp → targettests/execution/qpp_cpu_target.cpp
diff --git a/test/NVQPP/qspan_slices.cpp → targettests/execution/qspan_slices.cpp b/test/NVQPP/qspan_slices.cpp → targettests/execution/qspan_slices.cpp
diff --git a/test/NVQPP/sudoku_2x2-1.cpp → targettests/execution/sudoku_2x2-1.cpp b/test/NVQPP/sudoku_2x2-1.cpp → targettests/execution/sudoku_2x2-1.cpp
diff --git a/test/NVQPP/sudoku_2x2-bit_names.cpp → ...ttests/execution/sudoku_2x2-bit_names.cpp b/test/NVQPP/sudoku_2x2-bit_names.cpp → ...ttests/execution/sudoku_2x2-bit_names.cpp
diff --git a/test/NVQPP/sudoku_2x2-reg_name.cpp → ...ettests/execution/sudoku_2x2-reg_name.cpp b/test/NVQPP/sudoku_2x2-reg_name.cpp → ...ettests/execution/sudoku_2x2-reg_name.cpp
diff --git a/test/NVQPP/sudoku_2x2.cpp → targettests/execution/sudoku_2x2.cpp b/test/NVQPP/sudoku_2x2.cpp → targettests/execution/sudoku_2x2.cpp
diff --git a/test/NVQPP/swap_gate.cpp → targettests/execution/swap_gate.cpp b/test/NVQPP/swap_gate.cpp → targettests/execution/swap_gate.cpp
diff --git a/test/NVQPP/template_introspection.cpp → ...ests/execution/template_introspection.cpp b/test/NVQPP/template_introspection.cpp → ...ests/execution/template_introspection.cpp
diff --git a/test/NVQPP/test-3.cpp → targettests/execution/test-3.cpp b/test/NVQPP/test-3.cpp → targettests/execution/test-3.cpp
diff --git a/test/NVQPP/test-6.cpp → targettests/execution/test-6.cpp b/test/NVQPP/test-6.cpp → targettests/execution/test-6.cpp
diff --git a/test/NVQPP/to_integer.cpp → targettests/execution/to_integer.cpp b/test/NVQPP/to_integer.cpp → targettests/execution/to_integer.cpp
diff --git a/test/NVQPP/variable_size_qreg.cpp → targettests/execution/variable_size_qreg.cpp b/test/NVQPP/variable_size_qreg.cpp → targettests/execution/variable_size_qreg.cpp
diff --git a/targettests/ionq/bug_qubit.cpp b/targettests/ionq/bug_qubit.cpp
@@ -1 +1 @@
-../../test/NVQPP/bug_qubit.cpp
+../execution/bug_qubit.cpp
diff --git a/targettests/ionq/callable_kernel_arg.cpp b/targettests/ionq/callable_kernel_arg.cpp
@@ -1 +1 @@
-../../test/NVQPP/callable_kernel_arg.cpp
+../execution/callable_kernel_arg.cpp
diff --git a/targettests/ionq/cudaq_observe.cpp b/targettests/ionq/cudaq_observe.cpp
@@ -1 +1 @@
-../../test/NVQPP/cudaq_observe.cpp
+../execution/cudaq_observe.cpp
diff --git a/targettests/ionq/graph_coloring-1.cpp b/targettests/ionq/graph_coloring-1.cpp
@@ -1 +1 @@
-../../test/NVQPP/graph_coloring-1.cpp
+../execution/graph_coloring-1.cpp
diff --git a/targettests/ionq/graph_coloring.cpp b/targettests/ionq/graph_coloring.cpp
@@ -1 +1 @@
-../../test/NVQPP/graph_coloring.cpp
+../execution/graph_coloring.cpp
diff --git a/targettests/ionq/if_jit.cpp b/targettests/ionq/if_jit.cpp
@@ -1 +1 @@
-../../test/NVQPP/if_jit.cpp
+../execution/if_jit.cpp
diff --git a/targettests/ionq/load_value.cpp b/targettests/ionq/load_value.cpp
@@ -1 +1 @@
-../../test/NVQPP/load_value.cpp
+../execution/load_value.cpp
diff --git a/targettests/ionq/qspan_slices.cpp b/targettests/ionq/qspan_slices.cpp
@@ -1 +1 @@
-../../test/NVQPP/qspan_slices.cpp
+../execution/qspan_slices.cpp
diff --git a/targettests/ionq/sudoku_2x2-1.cpp b/targettests/ionq/sudoku_2x2-1.cpp
@@ -1 +1 @@
-../../test/NVQPP/sudoku_2x2-1.cpp
+../execution/sudoku_2x2-1.cpp
diff --git a/targettests/ionq/sudoku_2x2-bit_names.cpp b/targettests/ionq/sudoku_2x2-bit_names.cpp
@@ -1 +1 @@
-../../test/NVQPP/sudoku_2x2-bit_names.cpp
+../execution/sudoku_2x2-bit_names.cpp
diff --git a/targettests/ionq/sudoku_2x2-reg_name.cpp b/targettests/ionq/sudoku_2x2-reg_name.cpp
@@ -1 +1 @@
-../../test/NVQPP/sudoku_2x2-reg_name.cpp
+../execution/sudoku_2x2-reg_name.cpp
diff --git a/targettests/ionq/sudoku_2x2.cpp b/targettests/ionq/sudoku_2x2.cpp
@@ -1 +1 @@
-../../test/NVQPP/sudoku_2x2.cpp
+../execution/sudoku_2x2.cpp
diff --git a/targettests/ionq/swap_gate.cpp b/targettests/ionq/swap_gate.cpp
@@ -1 +1 @@
-../../test/NVQPP/swap_gate.cpp
+../execution/swap_gate.cpp
diff --git a/targettests/ionq/test-int8_t.cpp b/targettests/ionq/test-int8_t.cpp
@@ -1 +1 @@
-../../test/NVQPP/int8_t.cpp
+../execution/int8_t.cpp
diff --git a/targettests/ionq/test-int8_t_free_func.cpp b/targettests/ionq/test-int8_t_free_func.cpp
@@ -1 +1 @@
-../../test/NVQPP/int8_t_free_func.cpp
+../execution/int8_t_free_func.cpp
diff --git a/targettests/ionq/variable_size_qreg.cpp b/targettests/ionq/variable_size_qreg.cpp
@@ -1 +1 @@
-../../test/NVQPP/variable_size_qreg.cpp
+../execution/variable_size_qreg.cpp
diff --git a/targettests/iqm/bug_qubit.cpp b/targettests/iqm/bug_qubit.cpp
@@ -1 +1 @@
-../../test/NVQPP/bug_qubit.cpp
+../execution/bug_qubit.cpp
diff --git a/targettests/iqm/callable_kernel_arg.cpp b/targettests/iqm/callable_kernel_arg.cpp
@@ -1 +1 @@
-../../test/NVQPP/callable_kernel_arg.cpp
+../execution/callable_kernel_arg.cpp
diff --git a/targettests/iqm/cudaq_observe.cpp b/targettests/iqm/cudaq_observe.cpp
@@ -1 +1 @@
-../../test/NVQPP/cudaq_observe.cpp
+../execution/cudaq_observe.cpp
diff --git a/targettests/iqm/if_jit.cpp b/targettests/iqm/if_jit.cpp
@@ -1 +1 @@
-../../test/NVQPP/if_jit.cpp
+../execution/if_jit.cpp
diff --git a/targettests/iqm/load_value.cpp b/targettests/iqm/load_value.cpp
@@ -1 +1 @@
-../../test/NVQPP/load_value.cpp
+../execution/load_value.cpp
diff --git a/targettests/iqm/qspan_slices.cpp b/targettests/iqm/qspan_slices.cpp
@@ -1 +1 @@
-../../test/NVQPP/qspan_slices.cpp
+../execution/qspan_slices.cpp
diff --git a/targettests/iqm/swap_gate.cpp b/targettests/iqm/swap_gate.cpp
@@ -1 +1 @@
-../../test/NVQPP/swap_gate.cpp
+../execution/swap_gate.cpp
diff --git a/targettests/iqm/test-int8_t.cpp b/targettests/iqm/test-int8_t.cpp
@@ -1 +1 @@
-../../test/NVQPP/int8_t.cpp
+../execution/int8_t.cpp
diff --git a/targettests/iqm/test-int8_t_free_func.cpp b/targettests/iqm/test-int8_t_free_func.cpp
@@ -1 +1 @@
-../../test/NVQPP/int8_t_free_func.cpp
+../execution/int8_t_free_func.cpp
diff --git a/targettests/iqm/variable_size_qreg.cpp b/targettests/iqm/variable_size_qreg.cpp
@@ -1 +1 @@
-../../test/NVQPP/variable_size_qreg.cpp
+../execution/variable_size_qreg.cpp
diff --git a/targettests/lit.cfg.py b/targettests/lit.cfg.py
@@ -0,0 +1,77 @@
+# ============================================================================ #
+# Copyright (c) 2022 - 2023 NVIDIA Corporation & Affiliates.                   #
+# All rights reserved.                                                         #
+#                                                                              #
+# This source code and the accompanying materials are made available under     #
+# the terms of the Apache License 2.0 which accompanies this distribution.     #
+# ============================================================================ #
+
+import os
+import platform
+import re
+import subprocess
+import sys
+import bisect
+
+import lit.util
+from lit.llvm import llvm_config
+from lit.llvm.subst import ToolSubst
+from lit.llvm.subst import FindTool
+
+import lit.formats
+
+# The name of this test suite.
+config.name = 'CUDAQ-Target'
+
+# `testFormat`: The test format to use to interpret tests.
+config.test_format = lit.formats.ShTest(not llvm_config.use_lit_shell)
+
+config.suffixes = ['.cpp']
+
+# Exclude a list of directories from the test suite:
+#   - 'Inputs' contain auxiliary inputs for various tests.
+local_excludes = ['ionq', 'iqm', 'oqc', 'quantinuum',
+                  'Inputs', 'CMakeLists.txt', 'README.txt', 'LICENSE.txt']
+config.excludes = [exclude for exclude in config.excludes] + local_excludes
+
+config.substitutions.append(('%PATH%', config.environment['PATH']))
+config.substitutions.append(('%llvmshlibdir', config.llvm_shlib_dir))
+config.substitutions.append(('%pluginext', config.llvm_plugin_ext))
+config.substitutions.append(('%llvmInclude', config.llvm_install + "/include"))
+config.substitutions.append(('%cudaq_lib_dir', config.cudaq_lib_dir))
+config.substitutions.append(('%cudaq_plugin_ext', config.cudaq_plugin_ext))
+
+llvm_config.use_default_substitutions()
+
+# Ask `llvm-config` about asserts
+llvm_config.feature_config([('--assertion-mode', {'ON': 'asserts'})])
+
+# Allow to require specific build targets
+config.targets = frozenset(config.targets_to_build.split())
+for arch in config.targets_to_build.split():
+    config.available_features.add(arch.lower() + '-registered-target')
+
+# Allow to filter tests based on environment variables
+cpp_stds = ['c++17', 'c++20', 'c++23']
+std_up_to = os.environ.get('CUDAQ_CPP_STD', 'c++23').lower()
+for std in cpp_stds[:bisect.bisect(cpp_stds, std_up_to)]:
+    config.available_features.add(std)
+std_default = os.environ.get('CUDAQ_CPP_STD')
+if std_default is None:
+    config.substitutions.append(('%cpp_std', ''))
+else:
+    config.substitutions.append(('%cpp_std', '-std=' + std_default.lower()))
+
+# The root path where tests are located.
+config.test_source_root = os.path.dirname(__file__)
+
+# The root path where tests should be run.
+config.test_exec_root = os.path.join(config.cudaq_obj_root, 'targettests')
+
+# Propagate some variables from the host environment.
+llvm_config.with_system_environment(
+    ['HOME', 'INCLUDE', 'LIB', 'TMP', 'TEMP'])
+
+# Tweak the PATH to include the tools directory.
+llvm_config.with_environment('PATH', config.cudaq_tools_dir, append_path=True)
+llvm_config.with_environment('PATH', config.llvm_tools_dir, append_path=True)
diff --git a/targettests/lit.site.cfg.py.in b/targettests/lit.site.cfg.py.in
@@ -0,0 +1,50 @@
+@LIT_SITE_CFG_IN_HEADER@
+
+# ============================================================================ #
+# Copyright (c) 2022 - 2023 NVIDIA Corporation & Affiliates.                   #
+# All rights reserved.                                                         #
+#                                                                              #
+# This source code and the accompanying materials are made available under     #
+# the terms of the Apache License 2.0 which accompanies this distribution.     #
+# ============================================================================ #
+
+import sys
+
+# Helper function to convert cmake variable boolean definitions to True/False.
+def cmake_boolvar_to_bool(s):
+  return s == "1"
+
+config.llvm_tools_dir = lit_config.substitute("@LLVM_TOOLS_BINARY_DIR@")
+config.llvm_shlib_dir = lit_config.substitute(path(r"@SHLIBDIR@"))
+config.llvm_plugin_ext = "@LLVM_PLUGIN_EXT@"
+config.llvm_install = config.llvm_tools_dir + "/.."
+config.lit_tools_dir = "@LLVM_LIT_TOOLS_DIR@"
+config.errc_messages = "@LLVM_LIT_ERRC_MESSAGES@"
+config.cudaq_obj_root = "@CUDAQ_BINARY_DIR@"
+config.cudaq_src_dir = "@CUDAQ_SOURCE_DIR@"
+config.cudaq_tools_dir = lit_config.substitute("@CUDAQ_TOOLS_DIR@")
+config.cudaq_intrinsic_modules_dir = "@CUDAQ_INTRINSIC_MODULES_DIR@"
+config.cudaq_llvm_tools_dir = "@CMAKE_BINARY_DIR@/bin"
+config.cudaq_lib_dir = "@CMAKE_BINARY_DIR@/lib"
+config.cudaq_plugin_ext = "@LLVM_PLUGIN_EXT@"
+config.python_executable = "@PYTHON_EXECUTABLE@"
+config.cc = "@CMAKE_C_COMPILER@"
+config.targets_to_build = "@TARGETS_TO_BUILD@"
+config.excludes = ["@CUDAQ_EXTRA_CONFIG_EXCLUDES@"]
+config.pipefail = False
+
+# Is the nvcc compiler available?
+config.cuda_found = "@CUDA_FOUND@"
+if cmake_boolvar_to_bool(config.cuda_found):
+  config.available_features.add('nvcc')
+
+config.test_remote_sim = "@CUDAQ_TEST_REMOTE_SIM@"
+if cmake_boolvar_to_bool(config.test_remote_sim):
+  config.available_features.add('remote-sim')
+
+import lit.llvm
+lit.llvm.initialize(lit_config, config)
+
+# Let the main config do the real work.
+lit_config.load_config(config, "@CUDAQ_SOURCE_DIR@/targettests/lit.cfg.py")
+
diff --git a/targettests/oqc/bug_qubit.cpp b/targettests/oqc/bug_qubit.cpp
@@ -1 +1 @@
-../../test/NVQPP/bug_qubit.cpp
+../execution/bug_qubit.cpp
diff --git a/targettests/oqc/callable_kernel_arg.cpp b/targettests/oqc/callable_kernel_arg.cpp
@@ -1 +1 @@
-../../test/NVQPP/callable_kernel_arg.cpp
+../execution/callable_kernel_arg.cpp