Revert "Enable iree_static_linker_test for cross compile" (#10620)
Reverts iree-org/iree#10589
Need to revisit wasm setting
diff --git a/build_tools/cmake/iree_bytecode_module.cmake b/build_tools/cmake/iree_bytecode_module.cmake
index bb687a0..f8dd9e4 100644
--- a/build_tools/cmake/iree_bytecode_module.cmake
+++ b/build_tools/cmake/iree_bytecode_module.cmake
@@ -109,9 +109,20 @@
list(APPEND _OUTPUT_FILES "${_RULE_STATIC_LIB_PATH}" "${_STATIC_HDR_PATH}")
endif()
- iree_compile_flags_for_platform(_PLATFORM_FLAGS "${_RULE_FLAGS}")
- if(_PLATFORM_FLAGS)
- list(APPEND _ARGS ${_PLATFORM_FLAGS})
+ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv64" AND
+ CMAKE_SYSTEM_NAME STREQUAL "Linux" AND
+ NOT _RULE_FLAGS MATCHES "iree-llvm-target-triple")
+ # RV64 Linux crosscompile toolchain can support iree-compile with
+ # specific CPU flags. Add the llvm flags to support RV64 RVV codegen if
+ # llvm-target-triple is not specified.
+ list(APPEND _ARGS ${RISCV64_TEST_DEFAULT_LLVM_FLAGS})
+ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv32" AND
+ CMAKE_SYSTEM_NAME STREQUAL "Linux" AND
+ NOT _RULE_FLAGS MATCHES "iree-llvm-target-triple")
+ # RV32 Linux crosscompile toolchain can support iree-compile with
+ # specific CPU flags. Add the llvm flags to support RV32 RVV codegen if
+ # llvm-target-triple is not specified.
+ list(APPEND _ARGS ${RISCV32_TEST_DEFAULT_LLVM_FLAGS})
endif()
if(_RULE_FRIENDLY_NAME)
diff --git a/build_tools/cmake/iree_c_module.cmake b/build_tools/cmake/iree_c_module.cmake
index ca74060..06e265d 100644
--- a/build_tools/cmake/iree_c_module.cmake
+++ b/build_tools/cmake/iree_c_module.cmake
@@ -81,11 +81,6 @@
list(APPEND _OUTPUT_FILES "${_RULE_STATIC_LIB_PATH}" "${_STATIC_HDR_PATH}")
endif()
- iree_compile_flags_for_platform(_PLATFORM_FLAGS "${_RULE_FLAGS}")
- if(_PLATFORM_FLAGS)
- list(APPEND _ARGS "${_PLATFORM_FLAGS}")
- endif()
-
add_custom_command(
OUTPUT ${_OUTPUT_FILES}
COMMAND ${_COMPILE_TOOL_EXECUTABLE} ${_ARGS}
diff --git a/build_tools/cmake/iree_check_test.cmake b/build_tools/cmake/iree_check_test.cmake
index 0ae9de4..21c1482 100644
--- a/build_tools/cmake/iree_check_test.cmake
+++ b/build_tools/cmake/iree_check_test.cmake
@@ -28,6 +28,37 @@
${ARGN}
)
+ if(ANDROID AND NOT _RULE_FLAGS MATCHES "iree-llvm-target-triple")
+ # Android's CMake toolchain defines some variables that we can use to infer
+ # the appropriate target triple from the configured settings:
+ # https://developer.android.com/ndk/guides/cmake#android_platform
+ #
+ # In typical CMake fashion, the various strings are pretty fuzzy and can
+ # have multiple values like "latest", "android-25"/"25"/"android-N-MR1".
+ #
+ # From looking at the toolchain file, ANDROID_PLATFORM_LEVEL seems like it
+ # should pretty consistently be just a number we can use for target triple.
+ set(_TARGET_TRIPLE "aarch64-none-linux-android${ANDROID_PLATFORM_LEVEL}")
+ list(APPEND _RULE_FLAGS "--iree-llvm-target-triple=${_TARGET_TRIPLE}")
+ endif()
+
+ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv64" AND
+ CMAKE_SYSTEM_NAME STREQUAL "Linux" AND
+ _RULE_TARGET_BACKEND STREQUAL "llvm-cpu" AND
+ NOT _RULE_FLAGS MATCHES "iree-llvm-target-triple")
+ # RV64 Linux crosscompile toolchain can support iree_check_test with
+ # specific CPU flags. Add the llvm flags to support RV64 RVV codegen if
+ # llvm-target-triple is not specified.
+ list(APPEND _RULE_FLAGS ${RISCV64_TEST_DEFAULT_LLVM_FLAGS})
+ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv32" AND
+ CMAKE_SYSTEM_NAME STREQUAL "Linux" AND
+ NOT _RULE_FLAGS MATCHES "iree-llvm-target-triple")
+ # RV32 Linux crosscompile toolchain can support iree-compile with
+ # specific CPU flags. Add the llvm flags to support RV32 RVV codegen if
+ # llvm-target-triple is not specified.
+ list(APPEND _RULE_FLAGS ${RISCV32_TEST_DEFAULT_LLVM_FLAGS})
+ endif()
+
if(_RULE_TARGET_CPU_FEATURES)
if(NOT _RULE_TARGET_BACKEND IN_LIST IREE_TARGET_BACKENDS_SUPPORTING_TARGET_CPU_FEATURES)
message(SEND_ERROR "TARGET_CPU_FEATURES should be empty when \
diff --git a/build_tools/cmake/iree_hal_cts_test_suite.cmake b/build_tools/cmake/iree_hal_cts_test_suite.cmake
index 61880a9..d4685c5 100644
--- a/build_tools/cmake/iree_hal_cts_test_suite.cmake
+++ b/build_tools/cmake/iree_hal_cts_test_suite.cmake
@@ -84,6 +84,18 @@
"--compile-mode=hal-executable"
"--iree-hal-target-backends=${_RULE_COMPILER_TARGET_BACKEND}"
)
+ if(ANDROID)
+ set(_TARGET_TRIPLE "aarch64-none-linux-android${ANDROID_PLATFORM_LEVEL}")
+ list(APPEND _TRANSLATE_FLAGS "--iree-llvm-target-triple=${_TARGET_TRIPLE}")
+ endif()
+
+ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv64" AND
+ CMAKE_SYSTEM_NAME STREQUAL "Linux")
+ list(APPEND _TRANSLATE_FLAGS ${RISCV64_TEST_DEFAULT_LLVM_FLAGS})
+ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv32" AND
+ CMAKE_SYSTEM_NAME STREQUAL "Linux")
+ list(APPEND _TRANSLATE_FLAGS ${RISCV32_TEST_DEFAULT_LLVM_FLAGS})
+ endif()
# Skip if already created (multiple suites using the same compiler setting).
iree_package_name(_PACKAGE_NAME)
diff --git a/build_tools/cmake/iree_macros.cmake b/build_tools/cmake/iree_macros.cmake
index 589cb07..abdc29a 100644
--- a/build_tools/cmake/iree_macros.cmake
+++ b/build_tools/cmake/iree_macros.cmake
@@ -359,47 +359,3 @@
endif()
endforeach()
endfunction()
-
-# iree_compile_flags_for_patform
-#
-# Helper function to add necessary compile flags based on platform-specific
-# configurations. Note the flags are added for cpu backends only.
-function(iree_compile_flags_for_platform OUT_FLAGS IN_FLAGS)
- if(NOT (IN_FLAGS MATCHES "iree-hal-target-backends=llvm-cpu" OR
- IN_FLAGS MATCHES "iree-hal-target-backends=vmvx"))
- set(${OUT_FLAGS} "" PARENT_SCOPE)
- return()
- endif()
-
- if(ANDROID AND NOT IN_FLAGS MATCHES "iree-llvm-target-triple")
- # Android's CMake toolchain defines some variables that we can use to infer
- # the appropriate target triple from the configured settings:
- # https://developer.android.com/ndk/guides/cmake#android_platform
- #
- # In typical CMake fashion, the various strings are pretty fuzzy and can
- # have multiple values like "latest", "android-25"/"25"/"android-N-MR1".
- #
- # From looking at the toolchain file, ANDROID_PLATFORM_LEVEL seems like it
- # should pretty consistently be just a number we can use for target triple.
- set(_TARGET_TRIPLE "aarch64-none-linux-android${ANDROID_PLATFORM_LEVEL}")
- list(APPEND _FLAGS "--iree-llvm-target-triple=${_TARGET_TRIPLE}")
- endif()
-
- if(CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv64" AND
- CMAKE_SYSTEM_NAME STREQUAL "Linux" AND
- NOT IN_FLAGS MATCHES "iree-llvm-target-triple")
- # RV64 Linux crosscompile toolchain can support iree-compile with
- # specific CPU flags. Add the llvm flags to support RV64 RVV codegen if
- # llvm-target-triple is not specified.
- list(APPEND _FLAGS ${RISCV64_TEST_DEFAULT_LLVM_FLAGS})
- elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv32" AND
- CMAKE_SYSTEM_NAME STREQUAL "Linux" AND
- NOT IN_FLAGS MATCHES "iree-llvm-target-triple")
- # RV32 Linux crosscompile toolchain can support iree-compile with
- # specific CPU flags. Add the llvm flags to support RV32 RVV codegen if
- # llvm-target-triple is not specified.
- list(APPEND _FLAGS ${RISCV32_TEST_DEFAULT_LLVM_FLAGS})
- endif()
-
- set(${OUT_FLAGS} "${_FLAGS}" PARENT_SCOPE)
-endfunction()
diff --git a/build_tools/cmake/iree_static_linker_test.cmake b/build_tools/cmake/iree_static_linker_test.cmake
index 1de9f8f..fc603a3 100644
--- a/build_tools/cmake/iree_static_linker_test.cmake
+++ b/build_tools/cmake/iree_static_linker_test.cmake
@@ -52,8 +52,7 @@
return()
endif()
- if(NOT (IREE_TARGET_BACKEND_LLVM_CPU OR DEFINED IREE_HOST_BINARY_ROOT) OR
- NOT IREE_HAL_DRIVER_LOCAL_SYNC)
+ if(NOT IREE_TARGET_BACKEND_LLVM_CPU OR NOT IREE_HAL_DRIVER_LOCAL_SYNC)
return()
endif()
@@ -65,8 +64,7 @@
${ARGN}
)
- if(_RULE_EMITC AND
- NOT (IREE_OUTPUT_FORMAT_C OR DEFINED IREE_HOST_BINARY_ROOT))
+ if(_RULE_EMITC AND NOT IREE_OUTPUT_FORMAT_C)
return()
endif()
diff --git a/docs/developers/developing_iree/testing_guide.md b/docs/developers/developing_iree/testing_guide.md
index b5cdb08..de5779f 100644
--- a/docs/developers/developing_iree/testing_guide.md
+++ b/docs/developers/developing_iree/testing_guide.md
@@ -13,7 +13,7 @@
| | iree_trace_runner_test | Bazel/CMake | Host/Device |
| | iree_single_backend_generated_trace_runner_test | Bazel/CMake | Host/Device |
| | iree_generated_trace_runner_test | Bazel/CMake | Host/Device |
-| | iree_static_linker_test | CMake | Host/Device |
+| | iree_static_linker_test | CMake | Host |
There are also more `*_test_suite` targets that groups test targets with the
same configuration together.
