drop OPT_FLAGS parameter, no longer used (#8897)
That was added back when enabling mmt4d required preprocessing the input MLIR file with iree-opt with a custom pass. That has been unused since #8402 exposed that in iree-translate.
diff --git a/build_tools/bazel/iree_bytecode_module.bzl b/build_tools/bazel/iree_bytecode_module.bzl
index c6773a7..a1fe171 100644
--- a/build_tools/bazel/iree_bytecode_module.bzl
+++ b/build_tools/bazel/iree_bytecode_module.bzl
@@ -18,8 +18,6 @@
# TODO: Rename this to 'compile_tool'
translate_tool = "//iree/tools:iree-compile",
linker_tool = "@llvm-project//lld:lld",
- opt_tool = "//iree/tools:iree-opt",
- opt_flags = [],
c_identifier = "",
**kwargs):
"""Builds an IREE bytecode module.
@@ -33,41 +31,17 @@
Defaults to iree-compile.
linker_tool: the linker to use.
Defaults to the lld from the llvm-project directory.
- opt_tool: Defaulting to iree-opt. Tool used to preprocess the source file
- if opt_flags is specified.
- opt_flags: If specified, source files are preprocessed with opt_tool with
- these flags.
module: Optional. Specifies the path to use for the enerated IREE module (.vmfb).
c_identifier: Optional. Enables embedding the module as C data.
**kwargs: any additional attributes to pass to the underlying rules.
"""
- translate_src = src
-
- if opt_flags:
- translate_src = "%s.opt.mlir" % (name)
- native.genrule(
- name = "%s_opt" % (name),
- srcs = [src],
- outs = [translate_src],
- cmd = " ".join([
- "$(location %s)" % (opt_tool),
- " ".join([('"%s"' % flag) for flag in opt_flags]),
- "$(location %s)" % (src),
- "-o $(location %s)" % (translate_src),
- ]),
- tools = [opt_tool],
- message = "Transforming MLIR source for IREE module %s..." % (name),
- output_to_bindir = 1,
- **kwargs
- )
-
if not module:
module = "%s.vmfb" % (name)
native.genrule(
name = name,
- srcs = [translate_src],
+ srcs = [src],
outs = [
module,
],
@@ -79,7 +53,7 @@
"-iree-llvm-wasm-linker-path=$(location %s)" % (linker_tool),
# Note: -iree-llvm-system-linker-path is left unspecified.
"-o $(location %s)" % (module),
- "$(location %s)" % (translate_src),
+ "$(location %s)" % (src),
]),
]),
tools = [translate_tool, linker_tool],
diff --git a/build_tools/bazel/iree_check_test.bzl b/build_tools/bazel/iree_check_test.bzl
index 67832e9..63138e8 100644
--- a/build_tools/bazel/iree_check_test.bzl
+++ b/build_tools/bazel/iree_check_test.bzl
@@ -22,8 +22,6 @@
driver = None,
compiler_flags = [],
runner_args = [],
- opt_tool = "//iree/tools:iree-opt",
- opt_flags = [],
tags = [],
target_cpu_features = None,
timeout = None,
@@ -41,10 +39,6 @@
flags are passed automatically.
runner_args: additional runner_args to pass to iree-check-module. The driver and input file
are passed automatically.
- opt_tool: Defaulting to iree-opt. Tool used to preprocess the source files
- if opt_flags is specified.
- opt_flags: If specified, source files are preprocessed with OPT_TOOL with
- these flags.
tags: additional tags to apply to the generated test. A tag "driver=DRIVER" is added
automatically.
target_cpu_features: currently unimplemented (must be empty), will eventually allow specifying target CPU features.
@@ -64,8 +58,6 @@
"-mlir-print-op-on-diagnostic=false",
"-iree-hal-target-backends=%s" % target_backend,
] + compiler_flags,
- opt_tool = opt_tool,
- opt_flags = opt_flags,
visibility = ["//visibility:private"],
)
@@ -92,8 +84,6 @@
driver = None,
compiler_flags = [],
runner_args = [],
- opt_tool = "//iree/tools:iree-opt",
- opt_flags = [],
tags = [],
target_cpu_features = None,
timeout = None,
@@ -114,10 +104,6 @@
runner_args: additional runner_args to pass to the underlying iree-check-module tests. The
driver and input file are passed automatically. To use different runner_args per test,
create a separate suite or iree_check_test.
- opt_tool: Defaulting to iree-opt. Tool used to preprocess the source files
- if opt_flags is specified.
- opt_flags: If specified, source files are preprocessed with OPT_TOOL with
- these flags.
target_cpu_features: currently unimplemented (must be empty), will eventually allow specifying target CPU features.
tags: tags to apply to the generated tests. Note that as in standard test suites, manual
is treated specially and will also apply to the test suite itself.
@@ -145,8 +131,6 @@
driver = driver,
compiler_flags = compiler_flags,
runner_args = runner_args,
- opt_tool = opt_tool,
- opt_flags = opt_flags,
tags = tags,
timeout = timeout,
**kwargs
@@ -174,8 +158,6 @@
target_backends_and_drivers = ALL_TARGET_BACKENDS_AND_DRIVERS,
compiler_flags = [],
runner_args = [],
- opt_tool = "//iree/tools:iree-opt",
- opt_flags = [],
tags = [],
target_cpu_features_variants = [],
**kwargs):
@@ -192,10 +174,6 @@
runner_args: additional runner_args to pass to the underlying iree-check-module tests. The
driver and input file are passed automatically. To use different runner_args per test,
create a separate suite or iree_check_test.
- opt_tool: Defaulting to iree-opt. Tool used to preprocess the source files
- if opt_flags is specified.
- opt_flags: If specified, source files are preprocessed with OPT_TOOL with
- these flags.
tags: tags to apply to the generated tests. Note that as in standard test suites, manual
is treated specially and will also apply to the test suite itself.
target_cpu_features_variants: list of target cpu features variants. Currently unimplemented, so each
@@ -223,8 +201,6 @@
target_backend = backend,
compiler_flags = compiler_flags,
runner_args = runner_args,
- opt_tool = opt_tool,
- opt_flags = opt_flags,
tags = tags,
**kwargs
)
diff --git a/build_tools/bazel/iree_trace_runner_test.bzl b/build_tools/bazel/iree_trace_runner_test.bzl
index 963944e..8f3f8e0 100644
--- a/build_tools/bazel/iree_trace_runner_test.bzl
+++ b/build_tools/bazel/iree_trace_runner_test.bzl
@@ -19,8 +19,6 @@
trace,
compiler_flags = [],
runner_args = [],
- opt_tool = "//iree/tools:iree-opt",
- opt_flags = [],
tags = [],
target_cpu_features = None,
timeout = None,
@@ -38,10 +36,6 @@
and input file flags are passed automatically.
tags: Additional labels to apply to the test. "driver=${DRIVER}" is added
automatically.
- opt_tool: Defaulting to iree-opt. Tool used to preprocess the source files
- if opt_flags is specified.
- opt_flags: If specified, source files are preprocessed with opt_tool with
- these flags.
trace_runner: trace-runner program to run.
trace: trace file input to the trace-runner program.
module: specifies the path to use for the enerated IREE module (.vmfb). Mandatory,
@@ -64,8 +58,6 @@
"-mlir-print-op-on-diagnostic=false",
"-iree-hal-target-backends=%s" % target_backend,
] + compiler_flags,
- opt_tool = opt_tool,
- opt_flags = opt_flags,
visibility = ["//visibility:private"],
**kwargs
)
@@ -95,8 +87,6 @@
generator_args = [],
compiler_flags = [],
runner_args = [],
- opt_tool = "//iree/tools:iree-opt",
- opt_flags = [],
tags = [],
target_cpu_features = None,
timeout = None,
@@ -122,10 +112,6 @@
and input file flags are passed automatically.
tags: Additional labels to apply to the test. "driver=${DRIVER}" is added
automatically.
- opt_tool: Defaulting to iree-opt. Tool used to preprocess the source files
- if opt_flags is specified.
- opt_flags: If specified, source files are preprocessed with opt_tool with
- these flags.
trace_runner: trace-runner program to run.
timeout: timeout for the generated tests.
target_cpu_features: currently unimplemented (must be empty), will eventually allow specifying target CPU features.
@@ -166,8 +152,6 @@
trace = trace,
compiler_flags = compiler_flags,
runner_args = runner_args,
- opt_tool = opt_tool,
- opt_flags = opt_flags,
tags = tags,
timeout = timeout,
**kwargs
@@ -181,8 +165,6 @@
generator_args = [],
compiler_flags = [],
runner_args = [],
- opt_tool = "//iree/tools:iree-opt",
- opt_flags = [],
tags = [],
timeout = None,
target_cpu_features_variants = [],
@@ -204,14 +186,6 @@
and input file flags are passed automatically.
tags: Additional labels to apply to the test. "driver=${DRIVER}" is added
automatically.
- opt_tool: Defaulting to iree-opt. Tool used to preprocess the source files
- if opt_flags is specified.
- opt_flags: If specified, source files are preprocessed with opt_tool with
- these flags. The special string "#pass_options_variant#" is replaced
- with the empty string. That may in the future be changed to some
- automatically determined pass options for each entry in
- target_cpu_features_variants, as is currently done in the CMake
- build.
trace_runner: trace-runner program to run.
timeout: timeout for the generated tests.
target_cpu_features_variants: list of target cpu features variants. Currently unimplemented, so each
@@ -225,7 +199,6 @@
fail("Entry %s in target_cpu_features_variants: unimplemented" % target_cpu_features)
tests = []
- processed_opt_flags = [flag.replace("#pass_options_variant#", "") for flag in opt_flags]
processsed_compiler_flags = [flag.replace("#pass_options_variant#", "") for flag in compiler_flags]
for backend, driver in target_backends_and_drivers:
# CUDA backend/driver not supported by Bazel build.
@@ -241,8 +214,6 @@
generator_args = generator_args,
compiler_flags = processsed_compiler_flags,
runner_args = runner_args,
- opt_tool = opt_tool,
- opt_flags = processed_opt_flags,
tags = tags,
timeout = timeout,
**kwargs
diff --git a/build_tools/bazel_to_cmake/bazel_to_cmake_converter.py b/build_tools/bazel_to_cmake/bazel_to_cmake_converter.py
index 6de746e..c953943 100644
--- a/build_tools/bazel_to_cmake/bazel_to_cmake_converter.py
+++ b/build_tools/bazel_to_cmake/bazel_to_cmake_converter.py
@@ -436,7 +436,6 @@
flags=None,
translate_tool=None,
c_identifier=None,
- opt_flags=None,
testonly=None):
name_block = _convert_string_arg_block("NAME", name, quote=False)
src_block = _convert_string_arg_block("SRC", src)
@@ -444,7 +443,6 @@
translate_tool_block = _convert_target_block("TRANSLATE_TOOL",
translate_tool)
flags_block = _convert_string_list_block("FLAGS", flags)
- opt_flags_block = _convert_string_list_block("OPT_FLAGS", opt_flags)
testonly_block = _convert_option_block("TESTONLY", testonly)
self.converter.body += (f"iree_bytecode_module(\n"
@@ -453,7 +451,6 @@
f"{c_identifier_block}"
f"{translate_tool_block}"
f"{flags_block}"
- f"{opt_flags_block}"
f"{testonly_block}"
f" PUBLIC\n)\n\n")
@@ -541,7 +538,6 @@
target_backends_and_drivers=None,
runner_args=None,
tags=None,
- opt_flags=None,
target_cpu_features=None,
**kwargs):
name_block = _convert_string_arg_block("NAME", name, quote=False)
@@ -553,7 +549,6 @@
compiler_flags)
runner_args_block = _convert_string_list_block("RUNNER_ARGS", runner_args)
labels_block = _convert_string_list_block("LABELS", tags)
- opt_flags_block = _convert_string_list_block("OPT_FLAGS", opt_flags)
target_cpu_features_block = _convert_string_arg_block(
"TARGET_CPU_FEATURES", target_cpu_features)
@@ -565,7 +560,6 @@
f"{compiler_flags_block}"
f"{runner_args_block}"
f"{labels_block}"
- f"{opt_flags_block}"
f"{target_cpu_features_block}"
f")\n\n")
@@ -576,7 +570,6 @@
compiler_flags=None,
runner_args=None,
tags=None,
- opt_flags=None,
target_cpu_features_variants=None,
**kwargs):
target_backends = None
@@ -594,7 +587,6 @@
compiler_flags)
runner_args_block = _convert_string_list_block("RUNNER_ARGS", runner_args)
labels_block = _convert_string_list_block("LABELS", tags)
- opt_flags_block = _convert_string_list_block("OPT_FLAGS", opt_flags)
target_cpu_features_variants_block = _convert_string_list_block(
"TARGET_CPU_FEATURES_VARIANTS", target_cpu_features_variants)
@@ -606,7 +598,6 @@
f"{compiler_flags_block}"
f"{runner_args_block}"
f"{labels_block}"
- f"{opt_flags_block}"
f"{target_cpu_features_variants_block}"
f")\n\n")
@@ -619,8 +610,6 @@
compiler_flags=None,
runner_args=None,
tags=None,
- opt_tool=None,
- opt_flags=None,
target_cpu_features_variants=None,
**kwargs):
target_backends = None
@@ -646,7 +635,6 @@
compiler_flags)
runner_args_block = _convert_string_list_block("RUNNER_ARGS", runner_args)
labels_block = _convert_string_list_block("LABELS", tags)
- opt_flags_block = _convert_string_list_block("OPT_FLAGS", opt_flags)
target_cpu_features_variants_block = _convert_string_list_block(
"TARGET_CPU_FEATURES_VARIANTS", target_cpu_features_variants)
@@ -660,7 +648,6 @@
f"{compiler_flags_block}"
f"{runner_args_block}"
f"{labels_block}"
- f"{opt_flags_block}"
f"{target_cpu_features_variants_block}"
f")\n\n")
diff --git a/build_tools/cmake/iree_bytecode_module.cmake b/build_tools/cmake/iree_bytecode_module.cmake
index fedc2ba..7be31bb 100644
--- a/build_tools/cmake/iree_bytecode_module.cmake
+++ b/build_tools/cmake/iree_bytecode_module.cmake
@@ -32,8 +32,8 @@
cmake_parse_arguments(
_RULE
"PUBLIC;TESTONLY"
- "NAME;SRC;TRANSLATE_TOOL;C_IDENTIFIER;OPT_TOOL;MODULE_FILE_NAME"
- "FLAGS;OPT_FLAGS"
+ "NAME;SRC;TRANSLATE_TOOL;C_IDENTIFIER;MODULE_FILE_NAME"
+ "FLAGS"
${ARGN}
)
@@ -54,57 +54,12 @@
set(_MODULE_FILE_NAME "${_RULE_NAME}.vmfb")
endif()
- # If OPT_FLAGS was specified, preprocess the source file with the OPT_TOOL
- if(_RULE_OPT_FLAGS)
- # Create the filename for the output of OPT_TOOL, which
- # will relace _RULE_SRC as the input to iree_bytecode_module.
- set(_TRANSLATE_SRC_BASENAME "${_RULE_NAME}.opt.mlir")
- set(_TRANSLATE_SRC "${CMAKE_CURRENT_BINARY_DIR}/${_TRANSLATE_SRC_BASENAME}")
-
- # Set default for OPT_TOOL.
- if(_RULE_OPT_TOOL)
- set(_OPT_TOOL ${_RULE_OPT_TOOL})
- else()
- set(_OPT_TOOL "iree-opt")
- endif()
-
- # Prepare the OPT_TOOL command line.
- iree_get_executable_path(_OPT_TOOL_EXECUTABLE ${_OPT_TOOL})
-
- set(_ARGS "${_RULE_OPT_FLAGS}")
- get_filename_component(_SRC_PATH "${_RULE_SRC}" REALPATH)
- list(APPEND _ARGS "${_SRC_PATH}")
- list(APPEND _ARGS "-o")
- list(APPEND _ARGS "${_TRANSLATE_SRC}")
-
- add_custom_command(
- OUTPUT
- "${_TRANSLATE_SRC_BASENAME}"
- COMMAND
- ${_OPT_TOOL_EXECUTABLE}
- ${_ARGS}
- # Changes to the opt tool should trigger rebuilding.
- # Using {_OPT_TOOL} as the dependency would only work when the tools
- # are built in the same cmake build directory as the tests, that is,
- # when NOT cross-compiling. Using {_OPT_TOOL_EXECUTABLE} works
- # uniformly regardless of that.
- DEPENDS
- ${_OPT_TOOL_EXECUTABLE}
- ${_RULE_SRC}
- VERBATIM
- )
- else()
- # OPT_FLAGS was not specified, so are not using the OPT_TOOL.
- # Just pass the source file directly as the source for the bytecode module.
- set(_TRANSLATE_SRC "${_RULE_SRC}")
- endif()
-
iree_get_executable_path(_TRANSLATE_TOOL_EXECUTABLE ${_TRANSLATE_TOOL})
set(_ARGS "${_RULE_FLAGS}")
- get_filename_component(_TRANSLATE_SRC_PATH "${_TRANSLATE_SRC}" REALPATH)
- list(APPEND _ARGS "${_TRANSLATE_SRC_PATH}")
+ get_filename_component(_SRC_PATH "${_RULE_SRC}" REALPATH)
+ list(APPEND _ARGS "${_SRC_PATH}")
list(APPEND _ARGS "-o")
list(APPEND _ARGS "${_MODULE_FILE_NAME}")
@@ -140,7 +95,7 @@
DEPENDS
${_TRANSLATE_TOOL_EXECUTABLE}
${_LINKER_TOOL_EXECUTABLE}
- ${_TRANSLATE_SRC}
+ ${_RULE_SRC}
VERBATIM
)
diff --git a/build_tools/cmake/iree_check_test.cmake b/build_tools/cmake/iree_check_test.cmake
index 26ed4a4..4c6224a 100644
--- a/build_tools/cmake/iree_check_test.cmake
+++ b/build_tools/cmake/iree_check_test.cmake
@@ -18,8 +18,8 @@
cmake_parse_arguments(
_RULE
""
- "MODULE_NAME;SRC;TARGET_BACKEND;OPT_TOOL;MODULE_FILE_NAME"
- "FLAGS;OPT_FLAGS;TARGET_CPU_FEATURES"
+ "MODULE_NAME;SRC;TARGET_BACKEND;MODULE_FILE_NAME"
+ "FLAGS;TARGET_CPU_FEATURES"
${ARGN}
)
@@ -59,10 +59,6 @@
"-mlir-print-op-on-diagnostic=false"
"--iree-hal-target-backends=${_RULE_TARGET_BACKEND}"
${_RULE_FLAGS}
- OPT_TOOL
- ${_RULE_OPT_TOOL}
- OPT_FLAGS
- ${_RULE_OPT_FLAGS}
TESTONLY
)
endfunction()
@@ -86,10 +82,6 @@
# and input file are passed automatically.
# LABELS: Additional labels to apply to the test. The package path and
# "driver=${DRIVER}" are added automatically.
-# OPT_TOOL: Defaulting to iree-opt. Tool used to preprocess the source files
-# if OPT_FLAGS is specified.
-# OPT_FLAGS: If specified, source files are preprocessed with OPT_TOOL with
-# these flags.
# MODULE_FILE_NAME: Optional, specifies the absolute path to the filename
# to use for the generated IREE module (.vmfb).
# TARGET_CPU_FEATURES: If specified, a string passed as argument to
@@ -122,8 +114,8 @@
cmake_parse_arguments(
_RULE
""
- "NAME;SRC;TARGET_BACKEND;DRIVER;OPT_TOOL;MODULE_FILE_NAME"
- "COMPILER_FLAGS;RUNNER_ARGS;LABELS;OPT_FLAGS;TARGET_CPU_FEATURES"
+ "NAME;SRC;TARGET_BACKEND;DRIVER;MODULE_FILE_NAME"
+ "COMPILER_FLAGS;RUNNER_ARGS;LABELS;TARGET_CPU_FEATURES"
${ARGN}
)
@@ -153,10 +145,6 @@
"${_RULE_TARGET_BACKEND}"
FLAGS
${_RULE_COMPILER_FLAGS}
- OPT_TOOL
- ${_RULE_OPT_TOOL}
- OPT_FLAGS
- ${_RULE_OPT_FLAGS}
TARGET_CPU_FEATURES
${_RULE_TARGET_CPU_FEATURES}
)
@@ -228,10 +216,6 @@
# different args per test, create a separate suite or iree_check_test.
# LABELS: Additional labels to apply to the generated tests. The package path is
# added automatically.
-# OPT_TOOL: Defaulting to iree-opt. Tool used to preprocess the source files
-# if OPT_FLAGS is specified.
-# OPT_FLAGS: If specified, source files are preprocessed with OPT_TOOL with
-# these flags.
# TARGET_CPU_FEATURES: If specified, a string passed as argument to
# --iree-llvm-target-cpu-features.
function(iree_check_single_backend_test_suite)
@@ -246,8 +230,8 @@
cmake_parse_arguments(
_RULE
""
- "NAME;TARGET_BACKEND;DRIVER;OPT_TOOL"
- "SRCS;COMPILER_FLAGS;RUNNER_ARGS;LABELS;OPT_FLAGS;TARGET_CPU_FEATURES"
+ "NAME;TARGET_BACKEND;DRIVER"
+ "SRCS;COMPILER_FLAGS;RUNNER_ARGS;LABELS;TARGET_CPU_FEATURES"
${ARGN}
)
@@ -300,10 +284,6 @@
${_RULE_RUNNER_ARGS}
LABELS
${_RULE_LABELS}
- OPT_TOOL
- ${_RULE_OPT_TOOL}
- OPT_FLAGS
- ${_RULE_OPT_FLAGS}
TARGET_CPU_FEATURES
${_RULE_TARGET_CPU_FEATURES}
)
@@ -411,10 +391,6 @@
# test, create a separate suite or iree_check_test.
# LABELS: Additional labels to apply to the generated tests. The package path is
# added automatically.
-# OPT_TOOL: Defaulting to iree-opt. Tool used to preprocess the source files
-# if OPT_FLAGS is specified.
-# OPT_FLAGS: If specified, source files are preprocessed with OPT_TOOL with
-# these flags.
# TARGET_CPU_FEATURES_VARIANTS: list of target cpu features variants. Only used
# for drivers that vary based on the target CPU features. For each list
# element, a separate test is created, with the list element passed as
@@ -458,7 +434,6 @@
endif()
foreach(_TARGET_CPU_FEATURES_LIST_ELEM IN LISTS _TARGET_CPU_FEATURES_VARIANTS)
process_target_cpu_features("${_TARGET_CPU_FEATURES_LIST_ELEM}" _ENABLED _TARGET_CPU_FEATURES _TARGET_CPU_FEATURES_SUFFIX _TARGET_PASS_OPTIONS)
- string(REPLACE "#pass_options_variant#" "${_TARGET_PASS_OPTIONS}" _PROCESSED_OPT_FLAGS "${_RULE_OPT_FLAGS}")
string(REPLACE "#pass_options_variant#" "${_TARGET_PASS_OPTIONS}" _PROCESSED_COMPILER_FLAGS "${_RULE_COMPILER_FLAGS}")
if (NOT _ENABLED)
# The current entry is disabled on the target CPU architecture.
@@ -479,10 +454,6 @@
${_RULE_RUNNER_ARGS}
LABELS
${_RULE_LABELS}
- OPT_TOOL
- ${_RULE_OPT_TOOL}
- OPT_FLAGS
- ${_PROCESSED_OPT_FLAGS}
TARGET_CPU_FEATURES
${_TARGET_CPU_FEATURES}
)
diff --git a/build_tools/cmake/iree_trace_runner_test.cmake b/build_tools/cmake/iree_trace_runner_test.cmake
index 1160fa6..1c12fe2 100644
--- a/build_tools/cmake/iree_trace_runner_test.cmake
+++ b/build_tools/cmake/iree_trace_runner_test.cmake
@@ -22,10 +22,6 @@
# and input file flags are passed automatically.
# LABELS: Additional labels to apply to the test. The package path and
# "driver=${DRIVER}" are added automatically.
-# OPT_TOOL: Defaulting to iree-opt. Tool used to preprocess the source files
-# if OPT_FLAGS is specified.
-# OPT_FLAGS: If specified, source files are preprocessed with OPT_TOOL with
-# these flags.
# TRACE_RUNNER: trace-runner program to run.
# TRACE: trace file input to the trace-runner program.
# MODULE_FILE_NAME: specifies the absolute path to the filename to use for the
@@ -46,8 +42,8 @@
cmake_parse_arguments(
_RULE
""
- "NAME;SRC;TRACE;TARGET_BACKEND;DRIVER;OPT_TOOL;TRACE_RUNNER;MODULE_FILE_NAME"
- "COMPILER_FLAGS;RUNNER_ARGS;LABELS;OPT_FLAGS;TARGET_CPU_FEATURES"
+ "NAME;SRC;TRACE;TARGET_BACKEND;DRIVER;TRACE_RUNNER;MODULE_FILE_NAME"
+ "COMPILER_FLAGS;RUNNER_ARGS;LABELS;TARGET_CPU_FEATURES"
${ARGN}
)
@@ -67,10 +63,6 @@
"${_RULE_TARGET_BACKEND}"
FLAGS
${_RULE_COMPILER_FLAGS}
- OPT_TOOL
- ${_RULE_OPT_TOOL}
- OPT_FLAGS
- ${_RULE_OPT_FLAGS}
TARGET_CPU_FEATURES
${_RULE_TARGET_CPU_FEATURES}
)
@@ -142,10 +134,6 @@
# and input file flags are passed automatically.
# LABELS: Additional labels to apply to the test. The package path and
# "driver=${DRIVER}" are added automatically.
-# OPT_TOOL: Defaulting to iree-opt. Tool used to preprocess the source files
-# if OPT_FLAGS is specified.
-# OPT_FLAGS: If specified, source files are preprocessed with OPT_TOOL with
-# these flags.
# TRACE_RUNNER: trace-runner program to run.
# TARGET_CPU_FEATURES: If specified, a string passed as argument to
# --iree-llvm-target-cpu-features.
@@ -169,8 +157,8 @@
cmake_parse_arguments(
_RULE
""
- "NAME;GENERATOR;TARGET_BACKEND;DRIVER;OPT_TOOL;TRACE_RUNNER"
- "GENERATOR_ARGS;COMPILER_FLAGS;RUNNER_ARGS;LABELS;OPT_FLAGS;TARGET_CPU_FEATURES"
+ "NAME;GENERATOR;TARGET_BACKEND;DRIVER;TRACE_RUNNER"
+ "GENERATOR_ARGS;COMPILER_FLAGS;RUNNER_ARGS;LABELS;TARGET_CPU_FEATURES"
${ARGN}
)
@@ -256,10 +244,6 @@
${_RULE_RUNNER_ARGS}
LABELS
${_RULE_LABELS}
- OPT_TOOL
- ${_RULE_OPT_TOOL}
- OPT_FLAGS
- ${_RULE_OPT_FLAGS}
TARGET_CPU_FEATURES
${_RULE_TARGET_CPU_FEATURES}
)
@@ -302,10 +286,6 @@
# and input file flags are passed automatically.
# LABELS: Additional labels to apply to the test. The package path and
# "driver=${DRIVER}" are added automatically.
-# OPT_TOOL: Defaulting to iree-opt. Tool used to preprocess the source files
-# if OPT_FLAGS is specified.
-# OPT_FLAGS: If specified, source files are preprocessed with OPT_TOOL with
-# these flags.
# TRACE_RUNNER: trace-runner program to run.
# TARGET_CPU_FEATURES_VARIANTS: list of target cpu features variants. Only used
# for drivers that vary based on the target CPU features. For each list
@@ -321,8 +301,8 @@
cmake_parse_arguments(
_RULE
""
- "NAME;GENERATOR;OPT_TOOL;TRACE_RUNNER"
- "TARGET_BACKENDS;DRIVERS;GENERATOR_ARGS;COMPILER_FLAGS;RUNNER_ARGS;LABELS;OPT_FLAGS;TARGET_CPU_FEATURES_VARIANTS"
+ "NAME;GENERATOR;TRACE_RUNNER"
+ "TARGET_BACKENDS;DRIVERS;GENERATOR_ARGS;COMPILER_FLAGS;RUNNER_ARGS;LABELS;TARGET_CPU_FEATURES_VARIANTS"
${ARGN}
)
@@ -350,7 +330,6 @@
endif()
foreach(_TARGET_CPU_FEATURES_LIST_ELEM IN LISTS _TARGET_CPU_FEATURES_VARIANTS)
process_target_cpu_features("${_TARGET_CPU_FEATURES_LIST_ELEM}" _ENABLED _TARGET_CPU_FEATURES _TARGET_CPU_FEATURES_SUFFIX _TARGET_PASS_OPTIONS)
- string(REPLACE "#pass_options_variant#" "${_TARGET_PASS_OPTIONS}" _PROCESSED_OPT_FLAGS "${_RULE_OPT_FLAGS}")
string(REPLACE "#pass_options_variant#" "${_TARGET_PASS_OPTIONS}" _PROCESSED_COMPILER_FLAGS "${_RULE_COMPILER_FLAGS}")
if (NOT _ENABLED)
# The current entry is disabled on the target CPU architecture.
@@ -375,10 +354,6 @@
${_RULE_RUNNER_ARGS}
LABELS
${_RULE_LABELS}
- OPT_TOOL
- ${_RULE_OPT_TOOL}
- OPT_FLAGS
- ${_PROCESSED_OPT_FLAGS}
TARGET_CPU_FEATURES
${_TARGET_CPU_FEATURES}
)
