From 1d850724c3d03d5c6374129f90be0df4593b7b5c Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Tue, 18 Sep 2018 15:47:41 -0400 Subject: [PATCH] [spirv] Update external projects (#1546) --- external/SPIRV-Headers | 2 +- external/SPIRV-Tools | 2 +- external/googletest | 2 +- external/re2 | 2 +- tools/clang/lib/SPIRV/SPIRVEmitter.cpp | 12 ++++++++---- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/external/SPIRV-Headers b/external/SPIRV-Headers index 2c512180c..dcf23bdab 160000 --- a/external/SPIRV-Headers +++ b/external/SPIRV-Headers @@ -1 +1 @@ -Subproject commit 2c512180ca03b5d4f56283efc85745775b45fdc4 +Subproject commit dcf23bdabacc3c54b83b1f9367e7a8adb27f8d87 diff --git a/external/SPIRV-Tools b/external/SPIRV-Tools index b4d3618f7..9e99d8b69 160000 --- a/external/SPIRV-Tools +++ b/external/SPIRV-Tools @@ -1 +1 @@ -Subproject commit b4d3618f77eb49c9c7ec5a1fe6fc829fb5573194 +Subproject commit 9e99d8b6912b6f855c4f4df290b3844c46306964 diff --git a/external/googletest b/external/googletest index df428ec11..d25268a55 160000 --- a/external/googletest +++ b/external/googletest @@ -1 +1 @@ -Subproject commit df428ec11891f12c81e2872c0432e342b5403a34 +Subproject commit d25268a55f6f6f38c65a7d1b7b119e33a46d1688 diff --git a/external/re2 b/external/re2 index c6945bedb..4c916c947 160000 --- a/external/re2 +++ b/external/re2 @@ -1 +1 @@ -Subproject commit c6945bedb469c6d4275584a3c4e605dc15771614 +Subproject commit 4c916c947ab7f2ba2d280bb8c87540c365d30695 diff --git a/tools/clang/lib/SPIRV/SPIRVEmitter.cpp b/tools/clang/lib/SPIRV/SPIRVEmitter.cpp index a58027930..67bd443e1 100644 --- a/tools/clang/lib/SPIRV/SPIRVEmitter.cpp +++ b/tools/clang/lib/SPIRV/SPIRVEmitter.cpp @@ -204,14 +204,16 @@ bool spirvToolsLegalize(spv_target_env env, std::vector *module, const spv_position_t & /*position*/, const char *message) { *messages += message; }); + spvtools::OptimizerOptions options; + options.set_run_validator(false); + optimizer.RegisterLegalizationPasses(); optimizer.RegisterPass(spvtools::CreateReplaceInvalidOpcodePass()); optimizer.RegisterPass(spvtools::CreateCompactIdsPass()); - return optimizer.Run(module->data(), module->size(), module, {}, - /*skip_validation=*/true); + return optimizer.Run(module->data(), module->size(), module, options); } bool spirvToolsOptimize(spv_target_env env, std::vector *module, @@ -224,6 +226,9 @@ bool spirvToolsOptimize(spv_target_env env, std::vector *module, const spv_position_t & /*position*/, const char *message) { *messages += message; }); + spvtools::OptimizerOptions options; + options.set_run_validator(false); + if (flags.empty()) { optimizer.RegisterPerformancePasses(); optimizer.RegisterPass(spvtools::CreateCompactIdsPass()); @@ -237,8 +242,7 @@ bool spirvToolsOptimize(spv_target_env env, std::vector *module, return false; } - return optimizer.Run(module->data(), module->size(), module, {}, - /*skip_validation=*/true); + return optimizer.Run(module->data(), module->size(), module, options); } bool spirvToolsValidate(spv_target_env env, std::vector *module,