encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-07-08 14:15:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

spirv-reader: refactor definition info pertaining to pointers

Browse Source 
Change-Id: I3999f85c60a08f3eeb921b6931c07ca3bdd1f417
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/104760
Reviewed-by: Dan Sinclair <dsinclair@chromium.org>
Auto-Submit: David Neto <dneto@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: Dan Sinclair <dsinclair@chromium.org>
This commit is contained in:
David Neto 2022-10-06 16:55:10 +00:00 committed by Dawn LUCI CQ
parent d71caf7f58
commit 861099fc81
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/tint/reader/spirv/function.cc
View File

@ -4809,7 +4809,7 @@ bool FunctionEmitter::RegisterLocallyDefinedValues() {
if (type->AsPointer()) { if (type->AsPointer()) {
if (auto* ast_type = parser_impl_.ConvertType(inst.type_id())) { if (auto* ast_type = parser_impl_.ConvertType(inst.type_id())) {
if (auto* ptr = ast_type->As<Pointer>()) { if (auto* ptr = ast_type->As<Pointer>()) {
info->address_space = ptr->address_space; info->pointer.address_space = ptr->address_space;
} }
} }
switch (inst.opcode()) { switch (inst.opcode()) {
@ -4823,7 +4823,7 @@ bool FunctionEmitter::RegisterLocallyDefinedValues() {
case SpvOpCopyObject: case SpvOpCopyObject:
// Inherit from the first operand. We need this so we can pick up // Inherit from the first operand. We need this so we can pick up
// a remapped storage buffer. // a remapped storage buffer.
info->address_space = info->pointer.address_space =
GetAddressSpaceForPointerValue(inst.GetSingleWordInOperand(0)); GetAddressSpaceForPointerValue(inst.GetSingleWordInOperand(0));
break; break;
default: default:
@ -4849,7 +4849,7 @@ bool FunctionEmitter::RegisterLocallyDefinedValues() {
ast::AddressSpace FunctionEmitter::GetAddressSpaceForPointerValue(uint32_t id) { ast::AddressSpace FunctionEmitter::GetAddressSpaceForPointerValue(uint32_t id) {
auto where = def_info_.find(id); auto where = def_info_.find(id);
if (where != def_info_.end()) { if (where != def_info_.end()) {
auto candidate = where->second.get()->address_space; auto candidate = where->second.get()->pointer.address_space;
if (candidate != ast::AddressSpace::kInvalid) { if (candidate != ast::AddressSpace::kInvalid) {
return candidate; return candidate;
} }
@ -5053,7 +5053,7 @@ void FunctionEmitter::FindValuesNeedingNamedOrHoistedDefinition() {
// Avoid moving combinatorial values across constructs. This is a // Avoid moving combinatorial values across constructs. This is a
// simple heuristic to avoid changing the cost of an operation // simple heuristic to avoid changing the cost of an operation
// by moving it into or out of a loop, for example. // by moving it into or out of a loop, for example.
if ((def_info->address_space == ast::AddressSpace::kInvalid) && if ((def_info->pointer.address_space == ast::AddressSpace::kInvalid) &&
local_def.used_in_another_construct) { local_def.used_in_another_construct) {
should_hoist_to_let = true; should_hoist_to_let = true;
} }

24
src/tint/reader/spirv/function.h
View File

@ -325,18 +325,26 @@ struct DefInfo {
/// example, pointers. crbug.com/tint/98 /// example, pointers. crbug.com/tint/98
bool requires_hoisted_var_def = false; bool requires_hoisted_var_def = false;
/// The address space to use for this value, if it is of pointer type. /// Information about a pointer value, used to construct its WGSL type.
/// This is required to carry an address space override from a storage struct Pointer {
/// buffer expressed in the old style (with Uniform address space) /// The address space to use for this value, if it is of pointer type.
/// that needs to be remapped to StorageBuffer address space. /// This is required to carry an address space override from a storage
/// This is kInvalid for non-pointers. /// buffer expressed in the old style (with Uniform address space)
ast::AddressSpace address_space = ast::AddressSpace::kInvalid; /// that needs to be remapped to StorageBuffer address space.
/// This is kInvalid for non-pointers.
ast::AddressSpace address_space = ast::AddressSpace::kInvalid;
// TODO(crbug.com/tint/1041) track access mode.
};
/// The expression to use when sinking pointers into their use. /// The expression to use when sinking pointers into their use.
/// When encountering a use of this instruction, we will emit this expression /// When encountering a use of this instruction, we will emit this expression
/// instead. /// instead.
TypedExpression sink_pointer_source_expr = {}; TypedExpression sink_pointer_source_expr = {};
/// Collected information about a pointer value.
Pointer pointer;
/// The reason, if any, that this value should be ignored. /// The reason, if any, that this value should be ignored.
/// Normally no values are ignored. This field can be updated while /// Normally no values are ignored. This field can be updated while
/// generating code because sometimes we only discover necessary facts /// generating code because sometimes we only discover necessary facts
@ -360,8 +368,8 @@ inline std::ostream& operator<<(std::ostream& o, const DefInfo& di) {
} }
o << " requires_named_let_def: " << (di.requires_named_let_def ? "true" : "false") o << " requires_named_let_def: " << (di.requires_named_let_def ? "true" : "false")
<< " requires_hoisted_var_def: " << (di.requires_hoisted_var_def ? "true" : "false"); << " requires_hoisted_var_def: " << (di.requires_hoisted_var_def ? "true" : "false");
if (di.address_space != ast::AddressSpace::kNone) { if (di.pointer.address_space != ast::AddressSpace::kNone) {
o << " sc:" << int(di.address_space); o << " sc:" << int(di.pointer.address_space);
} }
switch (di.skip) { switch (di.skip) {
case SkipReason::kDontSkip: case SkipReason::kDontSkip: