Move generator script to top-level directory. * Consolidate cmake include files. * Consolidate scripts. Change-Id: Id41aeec9e0f0e539d96d5605cca72c58408b46f1
diff --git a/CMakeLists.txt b/CMakeLists.txt index bcd46a6..5f2c4bb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt
@@ -29,6 +29,7 @@ include(vec_cc_binary) include(vec_cc_test) +include(vec_cc_generated_test) add_subdirectory(springbok) add_subdirectory(hello_vec)
diff --git a/tests/vec_cc_generated_test.cmake b/cmake/vec_cc_generated_test.cmake similarity index 87% rename from tests/vec_cc_generated_test.cmake rename to cmake/vec_cc_generated_test.cmake index 43a10ff..b51f974 100644 --- a/tests/vec_cc_generated_test.cmake +++ b/cmake/vec_cc_generated_test.cmake
@@ -12,12 +12,13 @@ foreach(_OPFMT ${_RULE_OPFMT}) string(TOLOWER ${_OPFMT} _LOWER_OPFMT) set(_TEST_SRC ${CMAKE_CURRENT_BINARY_DIR}/generated/${_OPCODE}/${_OPCODE}_${_LOWER_OPFMT}_test.cpp) +find_file(_GEN_VEC_SCRIPT generate_vector_tests.py ${CMAKE_SOURCE_DIR}/scripts) add_custom_command( OUTPUT ${_TEST_SRC} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/templates/${_LOWER_OPFMT}_test.tpl.cpp - COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/scripts/generate_vector_tests.py + COMMAND python3 ${_GEN_VEC_SCRIPT} --template-path=${CMAKE_CURRENT_SOURCE_DIR}/templates/ --instruction-format ${_OPFMT} --op-code ${_OPCODE}
diff --git a/tests/scripts/generate_vector_tests.py b/scripts/generate_vector_tests.py similarity index 100% rename from tests/scripts/generate_vector_tests.py rename to scripts/generate_vector_tests.py
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index e3644c5..b2d178e 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt
@@ -1,5 +1,4 @@ cmake_minimum_required(VERSION 3.10) -include(vec_cc_generated_test.cmake) enable_language(ASM) add_library(test_v_helpers