Skip to content

Commit

Permalink
Fix mismatch between CMake option names. (#33)
Browse files Browse the repository at this point in the history
The `COMPILER_ARGS` option was getting ignored since `COMPILER_FLAGS` is
what the helper function was checking.

Probably some copy/paste bug when forking from
https://github.com/iree-org/iree/blob/main/build_tools/cmake/iree_e2e_generated_runner_test.cmake
where `COMPILER_FLAGS` and `RUNNER_ARGS` are used. I think it makes
sense to just call both `ARGS` or `FLAGS`.
  • Loading branch information
ScottTodd authored Oct 18, 2024
1 parent 3a0ea13 commit 9f6bba6
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
8 changes: 4 additions & 4 deletions linalg_ops/iree_test_suites_runner_test.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ include(CMakeParseArguments)
# TEST_RUNNER: Test runner program.
# TARGET_BACKEND: Target backend to compile for.
# DRIVER: Driver to run the module with.
# COMPILER_ARGS: additional args to pass to the compiler.
# COMPILER_FLAGS: additional args to pass to the compiler.
# Target backend flags are passed automatically.
# RUNNER_ARGS: Additional args to pass to the runner program.
# RUNNER_FLAGS: Additional args to pass to the runner program.
# The device and input file flags are passed automatically.
# LABELS: Additional labels to apply to the test.
# "driver=${DRIVER}" is added automatically.
Expand All @@ -29,7 +29,7 @@ function(iree_test_suites_runner_test)
_RULE
""
"NAME;TESTS_SRC;CALLS_SRC;TEST_RUNNER;TARGET_BACKEND;DRIVER"
"COMPILER_ARGS;RUNNER_ARGS;LABELS"
"COMPILER_FLAGS;RUNNER_FLAGS;LABELS"
${ARGN}
)

Expand Down Expand Up @@ -91,7 +91,7 @@ function(iree_test_suites_runner_test)
ARGS
"--module={{${_TESTS_VMFB}}}"
"--module={{${_CALLS_VMFB}}}"
${_RULE_RUNNER_ARGS}
${_RULE_RUNNER_FLAGS}
LABELS
${_RULE_LABELS}
DISABLED
Expand Down
20 changes: 10 additions & 10 deletions linalg_ops/matmul/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ foreach(_DTYPE IN LISTS _DTYPES)
"llvm-cpu"
DRIVER
"local-task"
COMPILER_ARGS
RUNNER_ARGS
COMPILER_FLAGS
RUNNER_FLAGS
LABELS
)
endforeach()
Expand Down Expand Up @@ -77,8 +77,8 @@ foreach(_DTYPE IN LISTS _DTYPES)
"vmvx"
DRIVER
"local-task"
COMPILER_ARGS
RUNNER_ARGS
COMPILER_FLAGS
RUNNER_FLAGS
LABELS
)
endforeach()
Expand Down Expand Up @@ -112,8 +112,8 @@ foreach(_DTYPE IN LISTS _DTYPES)
"vulkan-spirv"
DRIVER
"vulkan"
COMPILER_ARGS
RUNNER_ARGS
COMPILER_FLAGS
RUNNER_FLAGS
LABELS
)
endforeach()
Expand Down Expand Up @@ -148,8 +148,8 @@ foreach(_DTYPE IN LISTS _DTYPES)
"cuda"
DRIVER
"cuda"
COMPILER_ARGS
RUNNER_ARGS
COMPILER_FLAGS
RUNNER_FLAGS
LABELS
)
endforeach()
Expand Down Expand Up @@ -186,9 +186,9 @@ foreach(_DTYPE IN LISTS _DTYPES)
"rocm"
DRIVER
"hip"
COMPILER_ARGS
COMPILER_FLAGS
"--iree-hip-target=${IREE_HIP_TEST_TARGET_CHIP}"
RUNNER_ARGS
RUNNER_FLAGS
LABELS
)
endforeach()
Expand Down

0 comments on commit 9f6bba6

Please sign in to comment.