Skip to content

Commit

Permalink
TEST: Revert JIT changes to CMakelists.txt
Browse files Browse the repository at this point in the history
  • Loading branch information
@Shaikh-Ubaid
Shaikh-Ubaid committed Apr 24, 2024
1 parent 69b826e commit 2115b21
Showing 1 changed file with 5 additions and 36 deletions.
41 changes: 5 additions & 36 deletions integration_tests/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,8 @@ message("LPYTHON_RTLIB_DIR: ${LPYTHON_RTLIB_DIR}")
message("LPYTHON_RTLIB_LIBRARY: ${LPYTHON_RTLIB_LIBRARY}")


macro(RUN_UTIL RUN_FAIL RUN_NAME RUN_FILE_NAME RUN_LABELS RUN_EXTRAFILES RUN_NOMOD RUN_EXTRA_ARGS RUN_COPY_TO_BIN RUN_SKIP_ON_JIT)
macro(RUN_UTIL RUN_FAIL RUN_NAME RUN_FILE_NAME RUN_LABELS RUN_EXTRAFILES RUN_NOMOD RUN_EXTRA_ARGS RUN_COPY_TO_BIN)
set(fail ${${RUN_FAIL}})
set(skip_jit ${${RUN_SKIP_ON_JIT}})
set(name ${${RUN_NAME}})
set(file_name ${${RUN_FILE_NAME}})
set(labels ${${RUN_LABELS}})
Expand All @@ -102,21 +101,11 @@ macro(RUN_UTIL RUN_FAIL RUN_NAME RUN_FILE_NAME RUN_LABELS RUN_EXTRAFILES RUN_NOM
set_target_properties(${name} PROPERTIES LINKER_LANGUAGE C)
target_link_libraries(${name} lpython_rtlib)
add_test(${name} ${CMAKE_CURRENT_BINARY_DIR}/${name})
add_test(
NAME "${name}_jit"
COMMAND ${LPYTHON} --jit ${extra_args} ${CMAKE_CURRENT_SOURCE_DIR}/${file_name}.py)
if (labels)
set_tests_properties(${name} PROPERTIES LABELS "${labels}")
set_tests_properties("${name}_jit" PROPERTIES LABELS "${labels}")
endif()
if (${fail})
set_tests_properties(${name} PROPERTIES WILL_FAIL TRUE)
set_tests_properties("${name}_jit" PROPERTIES WILL_FAIL TRUE)
endif()
if (${skip_jit})
set_tests_properties("${name}_jit" PROPERTIES SKIP_RETURN_CODE ${skip_jit})
elseif (DEFINED ${RUN_EXTRAFILES} AND NOT ${RUN_FAIL})
set_tests_properties("${name}_jit" PROPERTIES SKIP_RETURN_CODE 1)
endif()
elseif (KIND STREQUAL "llvm_py")
add_custom_command(
Expand All @@ -129,21 +118,11 @@ macro(RUN_UTIL RUN_FAIL RUN_NAME RUN_FILE_NAME RUN_LABELS RUN_EXTRAFILES RUN_NOM
set_target_properties(${name} PROPERTIES LINKER_LANGUAGE C)
target_link_libraries(${name} lpython_rtlib Python::Python)
add_test(${name} ${CMAKE_CURRENT_BINARY_DIR}/${name})
add_test(
NAME "${name}_jit"
COMMAND ${LPYTHON} --jit ${extra_args} ${CMAKE_CURRENT_SOURCE_DIR}/${file_name}.py)
if (labels)
set_tests_properties(${name} PROPERTIES LABELS "${labels}")
set_tests_properties("${name}_jit" PROPERTIES LABELS "${labels}")
endif()
if (${fail})
set_tests_properties(${name} PROPERTIES WILL_FAIL TRUE)
set_tests_properties("${name}_jit" PROPERTIES WILL_FAIL TRUE)
endif()
if (${skip_jit})
set_tests_properties("${name}_jit" PROPERTIES SKIP_RETURN_CODE ${skip_jit})
elseif (DEFINED ${RUN_EXTRAFILES} AND NOT ${RUN_FAIL})
set_tests_properties("${name}_jit" PROPERTIES SKIP_RETURN_CODE 1)
endif()
elseif(KIND STREQUAL "llvm_sym")
add_custom_command(
Expand All @@ -160,21 +139,11 @@ macro(RUN_UTIL RUN_FAIL RUN_NAME RUN_FILE_NAME RUN_LABELS RUN_EXTRAFILES RUN_NOM
endif()
target_link_libraries(${name} lpython_rtlib ${SYMENGINE_LIB})
add_test(${name} ${CMAKE_CURRENT_BINARY_DIR}/${name})
add_test(
NAME "${name}_jit"
COMMAND ${LPYTHON} --enable-symengine --jit ${extra_args} ${CMAKE_CURRENT_SOURCE_DIR}/${file_name}.py)
if (labels)
set_tests_properties(${name} PROPERTIES LABELS "${labels}")
set_tests_properties("${name}_jit" PROPERTIES LABELS "${labels}")
endif()
if (${fail})
set_tests_properties(${name} PROPERTIES WILL_FAIL TRUE)
set_tests_properties("${name}_jit" PROPERTIES WILL_FAIL TRUE)
endif()
if (${skip_jit})
set_tests_properties("${name}_jit" PROPERTIES SKIP_RETURN_CODE ${skip_jit})
elseif (DEFINED ${RUN_EXTRAFILES} AND NOT ${RUN_FAIL})
set_tests_properties("${name}_jit" PROPERTIES SKIP_RETURN_CODE 1)
endif()
elseif(KIND STREQUAL "c")
add_custom_command(
Expand Down Expand Up @@ -343,7 +312,7 @@ endmacro(RUN_UTIL)

macro(RUN)
set(options FAIL NOFAST NOMOD ENABLE_CPYTHON LINK_NUMPY NO_WARNINGS)
set(oneValueArgs NAME IMPORT_PATH COPY_TO_BIN REQ_PY_VER SKIP_ON_JIT)
set(oneValueArgs NAME IMPORT_PATH COPY_TO_BIN REQ_PY_VER)
set(multiValueArgs LABELS EXTRAFILES)
cmake_parse_arguments(RUN "${options}" "${oneValueArgs}"
"${multiValueArgs}" ${ARGN} )
Expand Down Expand Up @@ -382,14 +351,14 @@ macro(RUN)
endif()

if (NOT FAST)
RUN_UTIL(RUN_FAIL RUN_NAME RUN_FILE_NAME RUN_LABELS RUN_EXTRAFILES RUN_NOMOD RUN_EXTRA_ARGS RUN_COPY_TO_BIN RUN_SKIP_ON_JIT)
RUN_UTIL(RUN_FAIL RUN_NAME RUN_FILE_NAME RUN_LABELS RUN_EXTRAFILES RUN_NOMOD RUN_EXTRA_ARGS RUN_COPY_TO_BIN)
endif()

if ((FAST) AND (NOT RUN_NOFAST))
set(RUN_EXTRA_ARGS ${RUN_EXTRA_ARGS} --fast)
set(RUN_NAME "${RUN_NAME}_FAST")
list(REMOVE_ITEM RUN_LABELS cpython cpython_sym) # remove cpython, cpython_sym, from --fast test
RUN_UTIL(RUN_FAIL RUN_NAME RUN_FILE_NAME RUN_LABELS RUN_EXTRAFILES RUN_NOMOD RUN_EXTRA_ARGS RUN_COPY_TO_BIN RUN_SKIP_ON_JIT)
RUN_UTIL(RUN_FAIL RUN_NAME RUN_FILE_NAME RUN_LABELS RUN_EXTRAFILES RUN_NOMOD RUN_EXTRA_ARGS RUN_COPY_TO_BIN)
endif()
endmacro(RUN)

Expand Down Expand Up @@ -837,7 +806,7 @@ RUN(NAME comp_01 LABELS cpython llvm c wasm wasm_x64)
RUN(NAME bit_operations_i32 LABELS cpython llvm c wasm wasm_x64)
RUN(NAME bit_operations_i64 LABELS cpython llvm c wasm)

RUN(NAME test_argv_01 LABELS cpython llvm NOFAST SKIP_ON_JIT 1)
RUN(NAME test_argv_01 LABELS cpython llvm NOFAST)
RUN(NAME global_syms_01 LABELS cpython llvm c)
RUN(NAME global_syms_02 LABELS cpython llvm c)
RUN(NAME global_syms_03_b LABELS cpython llvm c)
Expand Down

0 comments on commit 2115b21

Please sign in to comment.