Validate: (data) Block can't appear within a Block#2371
Validate: (data) Block can't appear within a Block#2371sarahM0 wants to merge 22 commits intoKhronosGroup:masterfrom
Conversation
source/val/validate_instruction.cpp
Outdated
| } | ||
|
|
||
| _.SetHasNestedBlockOrBufferBlockStruct(inst->id(), has_nested_blockOrBufferBlock_struct); | ||
| if(_.HasNestedBlockOrBufferBlockStruct(inst->id()) && _.HasDecoration(inst->id(), SpvDecorationBlock)){ |
There was a problem hiding this comment.
This always returns false. Could you tell me what am I doing wrong?
There was a problem hiding this comment.
I think the decorations have not been registered at this point. Your check should be performed later in the flow.
There was a problem hiding this comment.
That might be it. In that case I think we need to update HasDecoration definition to return an error, saying it doesn't know yet. Also I couldn't fully understand how this function works. I appreciate it if you could go through it with me when you were in office (while debugging with gdb it says: No source file named upgrade_memory_model.cpp.!).
…2370) Fix MergeBlocksReductionOpportunity so it checks whether it is still enabled Fixes KhronosGroup#2369. Added tests.
Fixes KhronosGroup#2374 * Block merging no longer merges unreachable blocks into their successors * added a test
| OpMemoryModel Logical GLSL450 | ||
| OpEntryPoint Fragment %1 "main" | ||
| OpExecutionMode %1 OriginUpperLeft | ||
There was a problem hiding this comment.
Do I need to be worried about these auto indentations which are done by my editor(Sublime)?
There was a problem hiding this comment.
Not as long as the tests keep passing and the format checker is ok.
| return false; | ||
| } | ||
|
|
||
| // Don't bother trying to merge unreachable blocks. |
There was a problem hiding this comment.
This looks like a bad rebase.
|
closed because of a bad rebase. |
Also updated known_failures Roll third_party/glslang/ 3cea2e5..37fc4d2 (4 commits) KhronosGroup/glslang@3cea2e5...37fc4d2 $ git log 3cea2e5..37fc4d2 --date=short --no-merges --format='%ad %ae %s' 2019-08-09 rharrison Make non-emscripten flags platform agnostic. 2019-08-09 rharrison Converted ENABLE_HLSL to a dependent option, so it can be always disabled in web builds 2019-08-09 rharrison Move build instructions to README.md 2019-08-08 rharrison Add WASM build target for Web version of glslang Roll third_party/googletest/ b4961ab1c..90a443f9c (6 commits) google/googletest@b4961ab...90a443f $ git log b4961ab1c..90a443f9c --date=short --no-merges --format='%ad %ae %s' 2019-08-07 absl-team Googletest export 2019-08-07 absl-team Googletest export 2019-08-07 krystian.kuzniarek fix an improperly generated table 2019-08-06 krystian.kuzniarek fix broken links 2019-08-06 antoine Fix KhronosGroup#2371: Redirect Windows CRT assertions to stderr 2019-08-01 krystian.kuzniarek remove an excessive mutable type specifier Roll third_party/spirv-tools/ 698b56a..f701237 (9 commits) KhronosGroup/SPIRV-Tools@698b56a...f701237 $ git log 698b56a..f701237 --date=short --no-merges --format='%ad %ae %s' 2019-08-12 stevenperron Remove useless semi-colons (KhronosGroup#2789) 2019-08-09 greg Instrument: Fix version 2 output record write for tess eval shaders. (KhronosGroup#2782) 2019-08-08 stevenperron Start SPIRV-Tools v2019.5 2019-08-08 stevenperron Finalize SPIRV-Tools v2019.4 2019-08-08 stevenperron Add descriptor array scalar replacement (KhronosGroup#2742) 2019-08-08 stevenperron Update CHANGES 2019-08-08 greg Add SPV_EXT_physical_storage_buffer to opt whitelists (KhronosGroup#2779) 2019-08-07 stevenperron Handle RelaxedPrecision in SROA (KhronosGroup#2788) 2019-08-07 zoddicus Add -fextra-semi to Clang builds (KhronosGroup#2787) Created with: roll-dep third_party/effcee third_party/glslang third_party/googletest third_party/re2 third_party/spirv-cross third_party/spirv-headers third_party/spirv-tools
Roll third_party/glslang/ f257e0e..983698b (2 commits) KhronosGroup/glslang@f257e0e...983698b $ git log f257e0e..983698b --date=short --no-merges --format='%ad %ae %s' 2020-08-23 john Revert "Merge pull request KhronosGroup#2371 from RafaelMarinheiro/master" 2020-08-21 julius.ikkala Obey ENABLE_PCH CMake option Created with: roll-dep third_party/glslang Roll third_party/googletest/ adeef1929..1e315c5b1 (14 commits) google/googletest@adeef19...1e315c5 $ git log adeef1929..1e315c5b1 --date=short --no-merges --format='%ad %ae %s' 2020-08-20 absl-team Googletest export 2020-08-17 absl-team Googletest export 2020-08-12 robert.earhart Export LICENSE 2020-08-03 amatanhead Remove ThrowsMessageHasSubstr and fix some nits after review 2020-07-13 amatanhead Cleanup a bulky expression, document implementation details 2020-07-07 amatanhead Fix build under msvc 2020-07-07 amatanhead Update tests after changing an error message 2020-07-07 amatanhead Fix build under msvc 2020-07-07 amatanhead Add a test to ensure that the `Throws` matcher only invokes its argument once. 2020-07-07 amatanhead Add a test for duplicate catch clauses in throw matchers, fix a couple of nitpicks. 2020-07-03 amatanhead Add missing documentation piece 2020-06-20 amatanhead Small improvements: code style and property name 2020-06-20 amatanhead Add matchers for testing exception properties 2018-05-01 lantw44 Avoid using environ on FreeBSD Created with: roll-dep third_party/googletest Roll third_party/spirv-cross/ 4c7944bb4..685f86471 (6 commits) KhronosGroup/SPIRV-Cross@4c7944b...685f864 $ git log 4c7944bb4..685f86471 --date=short --no-merges --format='%ad %ae %s' 2020-08-24 post Run format_all.sh. 2020-08-24 post Work around annoying warning on GCC 10.2. 2020-08-21 post Overhaul how we deal with reserved identifiers. 2020-08-20 post HLSL: Fix FragCoord.w. 2020-08-20 post HLSL: Deal with partially filled 16-byte word in cbuffers. 2020-08-20 post HLSL: Fix bug in is_packing_standard for cbuffer. Created with: roll-dep third_party/spirv-cross Roll third_party/spirv-tools/ b8de4f5..4dd1223 (9 commits) KhronosGroup/SPIRV-Tools@b8de4f5...4dd1223 $ git log b8de4f5..4dd1223 --date=short --no-merges --format='%ad %ae %s' 2020-08-21 andreperezmaselco.developer spirv-fuzz: Add words instead of logical operands (KhronosGroup#3728) 2020-08-20 dnovillo CCP should mark IR changed if it created new constants. (KhronosGroup#3732) 2020-08-19 antonikarp spirv-fuzz: add FuzzerPassAddCompositeInserts (KhronosGroup#3606) 2020-08-19 antonikarp spirv-fuzz: Support pointer types in FuzzerPassAddParameters (KhronosGroup#3627) 2020-08-18 jaebaek Let ADCE pass check DebugScope (KhronosGroup#3703) 2020-08-18 andreperezmaselco.developer spirv-opt: Implement opt::Function::HasEarlyReturn function (KhronosGroup#3711) 2020-08-17 andreperezmaselco.developer spirv-fuzz: Check termination instructions when donating modules (KhronosGroup#3710) 2020-08-17 jackoalan Fix -Wrange-loop-analysis warning (KhronosGroup#3712) 2020-08-17 andreperezmaselco.developer spirv-fuzz: Check header dominance when adding dead block (KhronosGroup#3694) Created with: roll-dep third_party/spirv-tools
To fix: #1587
Please review.