encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[spirv-reader] Refactor how we emit const definitions 

Take the type of a const-definition (or a write to a hoisted variable)
from the generated expression rather than the directly-converted type
from the SPIR-V ID.

This prepares the way for remapping storage buffers from
Uniform/BufferBlock to StorageBuffer/Block representation.

Bug: tint:99
Change-Id: I6104d8ad96312053562468a3cdb247932c1cb6cb
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/24604
Reviewed-by: dan sinclair <dsinclair@chromium.org>
This commit is contained in:
David Neto 2020-07-13 14:16:12 +00:00
parent 018428dcd0
commit 919011af0a
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/reader/spirv/function.cc
View File

@ -50,6 +50,7 @@
#include "src/ast/storage_class.h" #include "src/ast/storage_class.h"
#include "src/ast/switch_statement.h" #include "src/ast/switch_statement.h"
#include "src/ast/type/bool_type.h" #include "src/ast/type/bool_type.h"
#include "src/ast/type/pointer_type.h"
#include "src/ast/type/type.h" #include "src/ast/type/type.h"
#include "src/ast/type/u32_type.h" #include "src/ast/type/u32_type.h"
#include "src/ast/type/vector_type.h" #include "src/ast/type/vector_type.h"
@ -2480,9 +2481,8 @@ bool FunctionEmitter::EmitConstDefinition(
if (!ast_expr.expr) { if (!ast_expr.expr) {
return false; return false;
} }
auto ast_const = auto ast_const = parser_impl_.MakeVariable(
parser_impl_.MakeVariable(inst.result_id(), ast::StorageClass::kNone, inst.result_id(), ast::StorageClass::kNone, ast_expr.type);
parser_impl_.ConvertType(inst.type_id()));
if (!ast_const) { if (!ast_const) {
return false; return false;
} }
@ -2549,11 +2549,15 @@ bool FunctionEmitter::EmitStatement(const spvtools::opt::Instruction& inst) {
std::move(lhs.expr), std::move(rhs.expr))); std::move(lhs.expr), std::move(rhs.expr)));
return success(); return success();
} }
case SpvOpLoad: case SpvOpLoad: {
// Memory accesses must be issued in SPIR-V program order. // Memory accesses must be issued in SPIR-V program order.
// So represent a load by a new const definition. // So represent a load by a new const definition.
return EmitConstDefOrWriteToHoistedVar( auto expr = MakeExpression(inst.GetSingleWordInOperand(0));
inst, MakeExpression(inst.GetSingleWordInOperand(0))); // The load result type is the pointee type of its operand.
assert(expr.type->IsPointer());
expr.type = expr.type->AsPointer()->type();
return EmitConstDefOrWriteToHoistedVar(inst, std::move(expr));
}
case SpvOpCopyObject: case SpvOpCopyObject:
// Arguably, OpCopyObject is purely combinatorial. On the other hand, // Arguably, OpCopyObject is purely combinatorial. On the other hand,
// it exists to make a new name for something. So we choose to make // it exists to make a new name for something. So we choose to make

9
src/reader/spirv/function.h
View File

@ -525,16 +525,17 @@ class FunctionEmitter {
/// @returns false if emission failed. /// @returns false if emission failed.
bool EmitStatement(const spvtools::opt::Instruction& inst); bool EmitStatement(const spvtools::opt::Instruction& inst);
/// Emits a const definition for a SPIR-V value. /// Emits a const definition for the typed value in |ast_expr|, and
/// records it as the translation for the result ID from |inst|.
/// @param inst the SPIR-V instruction defining the value /// @param inst the SPIR-V instruction defining the value
/// @param ast_expr the already-computed AST expression for the value /// @param ast_expr the already-computed AST expression for the value
/// @returns false if emission failed. /// @returns false if emission failed.
bool EmitConstDefinition(const spvtools::opt::Instruction& inst, bool EmitConstDefinition(const spvtools::opt::Instruction& inst,
TypedExpression ast_expr); TypedExpression ast_expr);
/// Emits a write to a hoisted variable for the given SPIR-V id, /// Emits a write of the typed value in |ast_expr| to a hoisted variable
/// if that ID has a hoisted declaration. Otherwise, emits a const /// for the given SPIR-V ID, if that ID has a hoisted declaration. Otherwise,
/// definition instead. /// emits a const definition instead.
/// @param inst the SPIR-V instruction defining the value /// @param inst the SPIR-V instruction defining the value
/// @param ast_expr the already-computed AST expression for the value /// @param ast_expr the already-computed AST expression for the value
/// @returns false if emission failed. /// @returns false if emission failed.