2
0
Эх сурвалжийг харах

[spirv] Update external projects (#1546)

Lei Zhang 6 жил өмнө
parent
commit
1d850724c3

+ 1 - 1
external/SPIRV-Headers

@@ -1 +1 @@
-Subproject commit 2c512180ca03b5d4f56283efc85745775b45fdc4
+Subproject commit dcf23bdabacc3c54b83b1f9367e7a8adb27f8d87

+ 1 - 1
external/SPIRV-Tools

@@ -1 +1 @@
-Subproject commit b4d3618f77eb49c9c7ec5a1fe6fc829fb5573194
+Subproject commit 9e99d8b6912b6f855c4f4df290b3844c46306964

+ 1 - 1
external/googletest

@@ -1 +1 @@
-Subproject commit df428ec11891f12c81e2872c0432e342b5403a34
+Subproject commit d25268a55f6f6f38c65a7d1b7b119e33a46d1688

+ 1 - 1
external/re2

@@ -1 +1 @@
-Subproject commit c6945bedb469c6d4275584a3c4e605dc15771614
+Subproject commit 4c916c947ab7f2ba2d280bb8c87540c365d30695

+ 8 - 4
tools/clang/lib/SPIRV/SPIRVEmitter.cpp

@@ -204,14 +204,16 @@ bool spirvToolsLegalize(spv_target_env env, std::vector<uint32_t> *module,
                  const spv_position_t & /*position*/,
                  const spv_position_t & /*position*/,
                  const char *message) { *messages += message; });
                  const char *message) { *messages += message; });
 
 
+  spvtools::OptimizerOptions options;
+  options.set_run_validator(false);
+
   optimizer.RegisterLegalizationPasses();
   optimizer.RegisterLegalizationPasses();
 
 
   optimizer.RegisterPass(spvtools::CreateReplaceInvalidOpcodePass());
   optimizer.RegisterPass(spvtools::CreateReplaceInvalidOpcodePass());
 
 
   optimizer.RegisterPass(spvtools::CreateCompactIdsPass());
   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<uint32_t> *module,
 bool spirvToolsOptimize(spv_target_env env, std::vector<uint32_t> *module,
@@ -224,6 +226,9 @@ bool spirvToolsOptimize(spv_target_env env, std::vector<uint32_t> *module,
                  const spv_position_t & /*position*/,
                  const spv_position_t & /*position*/,
                  const char *message) { *messages += message; });
                  const char *message) { *messages += message; });
 
 
+  spvtools::OptimizerOptions options;
+  options.set_run_validator(false);
+
   if (flags.empty()) {
   if (flags.empty()) {
     optimizer.RegisterPerformancePasses();
     optimizer.RegisterPerformancePasses();
     optimizer.RegisterPass(spvtools::CreateCompactIdsPass());
     optimizer.RegisterPass(spvtools::CreateCompactIdsPass());
@@ -237,8 +242,7 @@ bool spirvToolsOptimize(spv_target_env env, std::vector<uint32_t> *module,
       return false;
       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<uint32_t> *module,
 bool spirvToolsValidate(spv_target_env env, std::vector<uint32_t> *module,