Add option for the max id bound. (#1870)
* Create a new entry point for the optimizer
Creates a new struct to hold the options for the optimizer, and creates
an entry point that take the optimizer options as a parameter.
The old entry point that takes validator options are now deprecated.
The validator options will be one of the optimizer options.
Part of the optimizer options will also be the upper bound on the id bound.
* Add a command line option to set the max value for the id bound. The default is 0x3FFFFF.
* Modify `TakeNextIdBound` to return 0 when the limit is reached.
diff --git a/include/spirv-tools/optimizer.hpp b/include/spirv-tools/optimizer.hpp
index 4364d9f..5a3c52f 100644
--- a/include/spirv-tools/optimizer.hpp
+++ b/include/spirv-tools/optimizer.hpp
@@ -160,13 +160,20 @@
bool Run(const uint32_t* original_binary, size_t original_binary_size,
std::vector<uint32_t>* optimized_binary) const;
- // Same as above, except passes |options| to the validator when trying to
- // validate the binary. If |skip_validation| is true, then the caller is
- // guaranteeing that |original_binary| is valid, and the validator will not
- // be run.
+ // DEPRECATED: Same as above, except passes |options| to the validator when
+ // trying to validate the binary. If |skip_validation| is true, then the
+ // caller is guaranteeing that |original_binary| is valid, and the validator
+ // will not be run. The |max_id_bound| is the limit on the max id in the
+ // module.
bool Run(const uint32_t* original_binary, const size_t original_binary_size,
std::vector<uint32_t>* optimized_binary,
- const ValidatorOptions& options, bool skip_validation = false) const;
+ const ValidatorOptions& options, bool skip_validation) const;
+
+ // Same as above, except it takes an options object. See the documentation
+ // for |OptimizerOptions| to see which options can be set.
+ bool Run(const uint32_t* original_binary, const size_t original_binary_size,
+ std::vector<uint32_t>* optimized_binary,
+ const spv_optimizer_options opt_options) const;
// Returns a vector of strings with all the pass names added to this
// optimizer's pass manager. These strings are valid until the associated