Skip to content

S
swiftshader
Commit e6f65d92 by Nicolas Capens Committed by Nicolas Capens
Options

Rename GenericValue to Operand

Bug: b/129000021 Change-Id: I0000fc5e65bde87e9037400002db37cb6d50960d Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/43688 Presubmit-Ready: Nicolas Capens <nicolascapens@google.com> Kokoro-Result: kokoro <noreply+kokoro@google.com> Tested-by: 's avatarNicolas Capens <nicolascapens@google.com> Reviewed-by: 's avatarBen Clayton <bclayton@google.com> Reviewed-by: 's avatarAntonio Maiorano <amaiorano@google.com>
parent 491555c2
Showing with 88 additions and 88 deletions
src/Pipeline/SpirvShader.cpp
...@@ -2009,7 +2009,7 @@ SpirvShader::EmitResult SpirvShader::EmitCompositeConstruct(InsnIterator insn, E ...@@ -2009,7 +2009,7 @@ SpirvShader::EmitResult SpirvShader::EmitCompositeConstruct(InsnIterator insn, E
Object::ID srcObjectId = insn.word(3u + i); Object::ID srcObjectId = insn.word(3u + i);
auto &srcObject = getObject(srcObjectId); auto &srcObject = getObject(srcObjectId);
auto &srcObjectTy = getType(srcObject.type); auto &srcObjectTy = getType(srcObject.type);
GenericValue srcObjectAccess(this, state, srcObjectId); Operand srcObjectAccess(this, state, srcObjectId);
for(auto j = 0u; j < srcObjectTy.sizeInComponents; j++) for(auto j = 0u; j < srcObjectTy.sizeInComponents; j++)
{ {
...@@ -2029,8 +2029,8 @@ SpirvShader::EmitResult SpirvShader::EmitCompositeInsert(InsnIterator insn, Emit ...@@ -2029,8 +2029,8 @@ SpirvShader::EmitResult SpirvShader::EmitCompositeInsert(InsnIterator insn, Emit
auto &newPartObjectTy = getType(newPartObject.type); auto &newPartObjectTy = getType(newPartObject.type);
auto firstNewComponent = WalkLiteralAccessChain(resultTypeId, insn.wordCount() - 5, insn.wordPointer(5)); auto firstNewComponent = WalkLiteralAccessChain(resultTypeId, insn.wordCount() - 5, insn.wordPointer(5));
GenericValue srcObjectAccess(this, state, insn.word(4)); Operand srcObjectAccess(this, state, insn.word(4));
GenericValue newPartObjectAccess(this, state, insn.word(3)); Operand newPartObjectAccess(this, state, insn.word(3));
// old components before // old components before
for(auto i = 0u; i < firstNewComponent; i++) for(auto i = 0u; i < firstNewComponent; i++)
...@@ -2059,7 +2059,7 @@ SpirvShader::EmitResult SpirvShader::EmitCompositeExtract(InsnIterator insn, Emi ...@@ -2059,7 +2059,7 @@ SpirvShader::EmitResult SpirvShader::EmitCompositeExtract(InsnIterator insn, Emi
Type::ID compositeTypeId = compositeObject.definition.word(1); Type::ID compositeTypeId = compositeObject.definition.word(1);
auto firstComponent = WalkLiteralAccessChain(compositeTypeId, insn.wordCount() - 4, insn.wordPointer(4)); auto firstComponent = WalkLiteralAccessChain(compositeTypeId, insn.wordCount() - 4, insn.wordPointer(4));
GenericValue compositeObjectAccess(this, state, insn.word(3)); Operand compositeObjectAccess(this, state, insn.word(3));
for(auto i = 0u; i < type.sizeInComponents; i++) for(auto i = 0u; i < type.sizeInComponents; i++)
{ {
dst.move(i, compositeObjectAccess.Float(firstComponent + i)); dst.move(i, compositeObjectAccess.Float(firstComponent + i));
...@@ -2077,8 +2077,8 @@ SpirvShader::EmitResult SpirvShader::EmitVectorShuffle(InsnIterator insn, EmitSt ...@@ -2077,8 +2077,8 @@ SpirvShader::EmitResult SpirvShader::EmitVectorShuffle(InsnIterator insn, EmitSt
// half type are all independent. // half type are all independent.
auto &firstHalfType = getType(getObject(insn.word(3)).type); auto &firstHalfType = getType(getObject(insn.word(3)).type);
GenericValue firstHalfAccess(this, state, insn.word(3)); Operand firstHalfAccess(this, state, insn.word(3));
GenericValue secondHalfAccess(this, state, insn.word(4)); Operand secondHalfAccess(this, state, insn.word(4));
for(auto i = 0u; i < type.sizeInComponents; i++) for(auto i = 0u; i < type.sizeInComponents; i++)
{ {
...@@ -2108,8 +2108,8 @@ SpirvShader::EmitResult SpirvShader::EmitVectorExtractDynamic(InsnIterator insn, ...@@ -2108,8 +2108,8 @@ SpirvShader::EmitResult SpirvShader::EmitVectorExtractDynamic(InsnIterator insn,
auto &dst = state->createIntermediate(insn.word(2), type.sizeInComponents); auto &dst = state->createIntermediate(insn.word(2), type.sizeInComponents);
auto &srcType = getType(getObject(insn.word(3)).type); auto &srcType = getType(getObject(insn.word(3)).type);
GenericValue src(this, state, insn.word(3)); Operand src(this, state, insn.word(3));
GenericValue index(this, state, insn.word(4)); Operand index(this, state, insn.word(4));
SIMD::UInt v = SIMD::UInt(0); SIMD::UInt v = SIMD::UInt(0);
...@@ -2127,9 +2127,9 @@ SpirvShader::EmitResult SpirvShader::EmitVectorInsertDynamic(InsnIterator insn, ...@@ -2127,9 +2127,9 @@ SpirvShader::EmitResult SpirvShader::EmitVectorInsertDynamic(InsnIterator insn,
auto &type = getType(insn.word(1)); auto &type = getType(insn.word(1));
auto &dst = state->createIntermediate(insn.word(2), type.sizeInComponents); auto &dst = state->createIntermediate(insn.word(2), type.sizeInComponents);
GenericValue src(this, state, insn.word(3)); Operand src(this, state, insn.word(3));
GenericValue component(this, state, insn.word(4)); Operand component(this, state, insn.word(4));
GenericValue index(this, state, insn.word(5)); Operand index(this, state, insn.word(5));
for(auto i = 0u; i < type.sizeInComponents; i++) for(auto i = 0u; i < type.sizeInComponents; i++)
{ {
...@@ -2143,10 +2143,10 @@ SpirvShader::EmitResult SpirvShader::EmitSelect(InsnIterator insn, EmitState *st ...@@ -2143,10 +2143,10 @@ SpirvShader::EmitResult SpirvShader::EmitSelect(InsnIterator insn, EmitState *st
{ {
auto &type = getType(insn.word(1)); auto &type = getType(insn.word(1));
auto &dst = state->createIntermediate(insn.word(2), type.sizeInComponents); auto &dst = state->createIntermediate(insn.word(2), type.sizeInComponents);
auto cond = GenericValue(this, state, insn.word(3)); auto cond = Operand(this, state, insn.word(3));
auto condIsScalar = (getType(cond.type).sizeInComponents == 1); auto condIsScalar = (getType(cond.type).sizeInComponents == 1);
auto lhs = GenericValue(this, state, insn.word(4)); auto lhs = Operand(this, state, insn.word(4));
auto rhs = GenericValue(this, state, insn.word(5)); auto rhs = Operand(this, state, insn.word(5));
for(auto i = 0u; i < type.sizeInComponents; i++) for(auto i = 0u; i < type.sizeInComponents; i++)
{ {
...@@ -2163,7 +2163,7 @@ SpirvShader::EmitResult SpirvShader::EmitAny(InsnIterator insn, EmitState *state ...@@ -2163,7 +2163,7 @@ SpirvShader::EmitResult SpirvShader::EmitAny(InsnIterator insn, EmitState *state
ASSERT(type.sizeInComponents == 1); ASSERT(type.sizeInComponents == 1);
auto &dst = state->createIntermediate(insn.word(2), type.sizeInComponents); auto &dst = state->createIntermediate(insn.word(2), type.sizeInComponents);
auto &srcType = getType(getObject(insn.word(3)).type); auto &srcType = getType(getObject(insn.word(3)).type);
auto src = GenericValue(this, state, insn.word(3)); auto src = Operand(this, state, insn.word(3));
SIMD::UInt result = src.UInt(0); SIMD::UInt result = src.UInt(0);
...@@ -2182,7 +2182,7 @@ SpirvShader::EmitResult SpirvShader::EmitAll(InsnIterator insn, EmitState *state ...@@ -2182,7 +2182,7 @@ SpirvShader::EmitResult SpirvShader::EmitAll(InsnIterator insn, EmitState *state
ASSERT(type.sizeInComponents == 1); ASSERT(type.sizeInComponents == 1);
auto &dst = state->createIntermediate(insn.word(2), type.sizeInComponents); auto &dst = state->createIntermediate(insn.word(2), type.sizeInComponents);
auto &srcType = getType(getObject(insn.word(3)).type); auto &srcType = getType(getObject(insn.word(3)).type);
auto src = GenericValue(this, state, insn.word(3)); auto src = Operand(this, state, insn.word(3));
SIMD::UInt result = src.UInt(0); SIMD::UInt result = src.UInt(0);
...@@ -2203,7 +2203,7 @@ SpirvShader::EmitResult SpirvShader::EmitAtomicOp(InsnIterator insn, EmitState * ...@@ -2203,7 +2203,7 @@ SpirvShader::EmitResult SpirvShader::EmitAtomicOp(InsnIterator insn, EmitState *
auto memorySemantics = static_cast<spv::MemorySemanticsMask>(getObject(semanticsId).constantValue[0]); auto memorySemantics = static_cast<spv::MemorySemanticsMask>(getObject(semanticsId).constantValue[0]);
auto memoryOrder = MemoryOrder(memorySemantics); auto memoryOrder = MemoryOrder(memorySemantics);
// Where no value is provided (increment/decrement) use an implicit value of 1. // Where no value is provided (increment/decrement) use an implicit value of 1.
auto value = (insn.wordCount() == 7) ? GenericValue(this, state, insn.word(6)).UInt(0) : RValue<SIMD::UInt>(1); auto value = (insn.wordCount() == 7) ? Operand(this, state, insn.word(6)).UInt(0) : RValue<SIMD::UInt>(1);
auto &dst = state->createIntermediate(resultId, resultType.sizeInComponents); auto &dst = state->createIntermediate(resultId, resultType.sizeInComponents);
auto ptr = state->getPointer(insn.word(3)); auto ptr = state->getPointer(insn.word(3));
auto ptrOffsets = ptr.offsets(); auto ptrOffsets = ptr.offsets();
...@@ -2274,8 +2274,8 @@ SpirvShader::EmitResult SpirvShader::EmitAtomicCompareExchange(InsnIterator insn ...@@ -2274,8 +2274,8 @@ SpirvShader::EmitResult SpirvShader::EmitAtomicCompareExchange(InsnIterator insn
auto memorySemanticsUnequal = static_cast<spv::MemorySemanticsMask>(getObject(insn.word(6)).constantValue[0]); auto memorySemanticsUnequal = static_cast<spv::MemorySemanticsMask>(getObject(insn.word(6)).constantValue[0]);
auto memoryOrderUnequal = MemoryOrder(memorySemanticsUnequal); auto memoryOrderUnequal = MemoryOrder(memorySemanticsUnequal);
auto value = GenericValue(this, state, insn.word(7)); auto value = Operand(this, state, insn.word(7));
auto comparator = GenericValue(this, state, insn.word(8)); auto comparator = Operand(this, state, insn.word(8));
auto &dst = state->createIntermediate(resultId, resultType.sizeInComponents); auto &dst = state->createIntermediate(resultId, resultType.sizeInComponents);
auto ptr = state->getPointer(insn.word(3)); auto ptr = state->getPointer(insn.word(3));
auto ptrOffsets = ptr.offsets(); auto ptrOffsets = ptr.offsets();
...@@ -2302,7 +2302,7 @@ SpirvShader::EmitResult SpirvShader::EmitCopyObject(InsnIterator insn, EmitState ...@@ -2302,7 +2302,7 @@ SpirvShader::EmitResult SpirvShader::EmitCopyObject(InsnIterator insn, EmitState
{ {
auto ty = getType(insn.word(1)); auto ty = getType(insn.word(1));
auto &dst = state->createIntermediate(insn.word(2), ty.sizeInComponents); auto &dst = state->createIntermediate(insn.word(2), ty.sizeInComponents);
auto src = GenericValue(this, state, insn.word(3)); auto src = Operand(this, state, insn.word(3));
for(uint32_t i = 0; i < ty.sizeInComponents; i++) for(uint32_t i = 0; i < ty.sizeInComponents; i++)
{ {
dst.move(i, src.Int(i)); dst.move(i, src.Int(i));
...@@ -2428,7 +2428,7 @@ VkShaderStageFlagBits SpirvShader::executionModelToStage(spv::ExecutionModel mod ...@@ -2428,7 +2428,7 @@ VkShaderStageFlagBits SpirvShader::executionModelToStage(spv::ExecutionModel mod
} }
} }
SpirvShader::GenericValue::GenericValue(SpirvShader const *shader, EmitState const *state, SpirvShader::Object::ID objId) SpirvShader::Operand::Operand(SpirvShader const *shader, EmitState const *state, SpirvShader::Object::ID objId)
: obj(shader->getObject(objId)) : obj(shader->getObject(objId))
, intermediate(obj.kind == SpirvShader::Object::Kind::Intermediate ? &state->getIntermediate(objId) : nullptr) , intermediate(obj.kind == SpirvShader::Object::Kind::Intermediate ? &state->getIntermediate(objId) : nullptr)
, type(obj.type) , type(obj.type)
......
src/Pipeline/SpirvShader.hpp
...@@ -961,13 +961,13 @@ private: ...@@ -961,13 +961,13 @@ private:
// Constants are transparently widened to per-lane values in operator[]. // Constants are transparently widened to per-lane values in operator[].
// This is appropriate in most cases -- if we're not going to do something // This is appropriate in most cases -- if we're not going to do something
// significantly different based on whether the value is uniform across lanes. // significantly different based on whether the value is uniform across lanes.
class GenericValue class Operand
{ {
SpirvShader::Object const &obj; SpirvShader::Object const &obj;
Intermediate const *intermediate; Intermediate const *intermediate;
public: public:
GenericValue(SpirvShader const *shader, EmitState const *state, SpirvShader::Object::ID objId); Operand(SpirvShader const *shader, EmitState const *state, SpirvShader::Object::ID objId);
RValue<SIMD::Float> Float(uint32_t i) const RValue<SIMD::Float> Float(uint32_t i) const
{ {
...@@ -1136,7 +1136,7 @@ private: ...@@ -1136,7 +1136,7 @@ private:
EmitResult EmitArrayLength(InsnIterator insn, EmitState *state) const; EmitResult EmitArrayLength(InsnIterator insn, EmitState *state) const;
void GetImageDimensions(EmitState const *state, Type const &resultTy, Object::ID imageId, Object::ID lodId, Intermediate &dst) const; void GetImageDimensions(EmitState const *state, Type const &resultTy, Object::ID imageId, Object::ID lodId, Intermediate &dst) const;
SIMD::Pointer GetTexelAddress(EmitState const *state, SIMD::Pointer base, GenericValue const &coordinate, Type const &imageType, Pointer<Byte> descriptor, int texelSize, Object::ID sampleId, bool useStencilAspect) const; SIMD::Pointer GetTexelAddress(EmitState const *state, SIMD::Pointer base, Operand const &coordinate, Type const &imageType, Pointer<Byte> descriptor, int texelSize, Object::ID sampleId, bool useStencilAspect) const;
uint32_t GetConstScalarInt(Object::ID id) const; uint32_t GetConstScalarInt(Object::ID id) const;
void EvalSpecConstantOp(InsnIterator insn); void EvalSpecConstantOp(InsnIterator insn);
void EvalSpecConstantUnaryOp(InsnIterator insn); void EvalSpecConstantUnaryOp(InsnIterator insn);
...@@ -1168,7 +1168,7 @@ private: ...@@ -1168,7 +1168,7 @@ private:
static bool IsStatement(spv::Op op); static bool IsStatement(spv::Op op);
// Helper as we often need to take dot products as part of doing other things. // Helper as we often need to take dot products as part of doing other things.
SIMD::Float Dot(unsigned numComponents, GenericValue const &x, GenericValue const &y) const; SIMD::Float Dot(unsigned numComponents, Operand const &x, Operand const &y) const;
// Splits x into a floating-point significand in the range [0.5, 1.0) // Splits x into a floating-point significand in the range [0.5, 1.0)
// and an integral exponent of two, such that: // and an integral exponent of two, such that:
......
src/Pipeline/SpirvShaderArithmetic.cpp
...@@ -24,8 +24,8 @@ SpirvShader::EmitResult SpirvShader::EmitVectorTimesScalar(InsnIterator insn, Em ...@@ -24,8 +24,8 @@ SpirvShader::EmitResult SpirvShader::EmitVectorTimesScalar(InsnIterator insn, Em
{ {
auto &type = getType(insn.word(1)); auto &type = getType(insn.word(1));
auto &dst = state->createIntermediate(insn.word(2), type.sizeInComponents); auto &dst = state->createIntermediate(insn.word(2), type.sizeInComponents);
auto lhs = GenericValue(this, state, insn.word(3)); auto lhs = Operand(this, state, insn.word(3));
auto rhs = GenericValue(this, state, insn.word(4)); auto rhs = Operand(this, state, insn.word(4));
for(auto i = 0u; i < type.sizeInComponents; i++) for(auto i = 0u; i < type.sizeInComponents; i++)
{ {
...@@ -39,8 +39,8 @@ SpirvShader::EmitResult SpirvShader::EmitMatrixTimesVector(InsnIterator insn, Em ...@@ -39,8 +39,8 @@ SpirvShader::EmitResult SpirvShader::EmitMatrixTimesVector(InsnIterator insn, Em
{ {
auto &type = getType(insn.word(1)); auto &type = getType(insn.word(1));
auto &dst = state->createIntermediate(insn.word(2), type.sizeInComponents); auto &dst = state->createIntermediate(insn.word(2), type.sizeInComponents);
auto lhs = GenericValue(this, state, insn.word(3)); auto lhs = Operand(this, state, insn.word(3));
auto rhs = GenericValue(this, state, insn.word(4)); auto rhs = Operand(this, state, insn.word(4));
auto rhsType = getType(rhs.type); auto rhsType = getType(rhs.type);
for(auto i = 0u; i < type.sizeInComponents; i++) for(auto i = 0u; i < type.sizeInComponents; i++)
...@@ -60,8 +60,8 @@ SpirvShader::EmitResult SpirvShader::EmitVectorTimesMatrix(InsnIterator insn, Em ...@@ -60,8 +60,8 @@ SpirvShader::EmitResult SpirvShader::EmitVectorTimesMatrix(InsnIterator insn, Em
{ {
auto &type = getType(insn.word(1)); auto &type = getType(insn.word(1));
auto &dst = state->createIntermediate(insn.word(2), type.sizeInComponents); auto &dst = state->createIntermediate(insn.word(2), type.sizeInComponents);
auto lhs = GenericValue(this, state, insn.word(3)); auto lhs = Operand(this, state, insn.word(3));
auto rhs = GenericValue(this, state, insn.word(4)); auto rhs = Operand(this, state, insn.word(4));
auto lhsType = getType(lhs.type); auto lhsType = getType(lhs.type);
for(auto i = 0u; i < type.sizeInComponents; i++) for(auto i = 0u; i < type.sizeInComponents; i++)
...@@ -81,8 +81,8 @@ SpirvShader::EmitResult SpirvShader::EmitMatrixTimesMatrix(InsnIterator insn, Em ...@@ -81,8 +81,8 @@ SpirvShader::EmitResult SpirvShader::EmitMatrixTimesMatrix(InsnIterator insn, Em
{ {
auto &type = getType(insn.word(1)); auto &type = getType(insn.word(1));
auto &dst = state->createIntermediate(insn.word(2), type.sizeInComponents); auto &dst = state->createIntermediate(insn.word(2), type.sizeInComponents);
auto lhs = GenericValue(this, state, insn.word(3)); auto lhs = Operand(this, state, insn.word(3));
auto rhs = GenericValue(this, state, insn.word(4)); auto rhs = Operand(this, state, insn.word(4));
auto numColumns = type.definition.word(3); auto numColumns = type.definition.word(3);
auto numRows = getType(type.definition.word(2)).definition.word(3); auto numRows = getType(type.definition.word(2)).definition.word(3);
...@@ -108,8 +108,8 @@ SpirvShader::EmitResult SpirvShader::EmitOuterProduct(InsnIterator insn, EmitSta ...@@ -108,8 +108,8 @@ SpirvShader::EmitResult SpirvShader::EmitOuterProduct(InsnIterator insn, EmitSta
{ {
auto &type = getType(insn.word(1)); auto &type = getType(insn.word(1));
auto &dst = state->createIntermediate(insn.word(2), type.sizeInComponents); auto &dst = state->createIntermediate(insn.word(2), type.sizeInComponents);
auto lhs = GenericValue(this, state, insn.word(3)); auto lhs = Operand(this, state, insn.word(3));
auto rhs = GenericValue(this, state, insn.word(4)); auto rhs = Operand(this, state, insn.word(4));
auto &lhsType = getType(lhs.type); auto &lhsType = getType(lhs.type);
auto &rhsType = getType(rhs.type); auto &rhsType = getType(rhs.type);
...@@ -137,7 +137,7 @@ SpirvShader::EmitResult SpirvShader::EmitTranspose(InsnIterator insn, EmitState ...@@ -137,7 +137,7 @@ SpirvShader::EmitResult SpirvShader::EmitTranspose(InsnIterator insn, EmitState
{ {
auto &type = getType(insn.word(1)); auto &type = getType(insn.word(1));
auto &dst = state->createIntermediate(insn.word(2), type.sizeInComponents); auto &dst = state->createIntermediate(insn.word(2), type.sizeInComponents);
auto mat = GenericValue(this, state, insn.word(3)); auto mat = Operand(this, state, insn.word(3));
auto numCols = type.definition.word(3); auto numCols = type.definition.word(3);
auto numRows = getType(type.definition.word(2)).sizeInComponents; auto numRows = getType(type.definition.word(2)).sizeInComponents;
...@@ -157,7 +157,7 @@ SpirvShader::EmitResult SpirvShader::EmitUnaryOp(InsnIterator insn, EmitState *s ...@@ -157,7 +157,7 @@ SpirvShader::EmitResult SpirvShader::EmitUnaryOp(InsnIterator insn, EmitState *s
{ {
auto &type = getType(insn.word(1)); auto &type = getType(insn.word(1));
auto &dst = state->createIntermediate(insn.word(2), type.sizeInComponents); auto &dst = state->createIntermediate(insn.word(2), type.sizeInComponents);
auto src = GenericValue(this, state, insn.word(3)); auto src = Operand(this, state, insn.word(3));
for(auto i = 0u; i < type.sizeInComponents; i++) for(auto i = 0u; i < type.sizeInComponents; i++)
{ {
...@@ -169,9 +169,9 @@ SpirvShader::EmitResult SpirvShader::EmitUnaryOp(InsnIterator insn, EmitState *s ...@@ -169,9 +169,9 @@ SpirvShader::EmitResult SpirvShader::EmitUnaryOp(InsnIterator insn, EmitState *s
break; break;
case spv::OpBitFieldInsert: case spv::OpBitFieldInsert:
{ {
auto insert = GenericValue(this, state, insn.word(4)).UInt(i); auto insert = Operand(this, state, insn.word(4)).UInt(i);
auto offset = GenericValue(this, state, insn.word(5)).UInt(0); auto offset = Operand(this, state, insn.word(5)).UInt(0);
auto count = GenericValue(this, state, insn.word(6)).UInt(0); auto count = Operand(this, state, insn.word(6)).UInt(0);
auto one = SIMD::UInt(1); auto one = SIMD::UInt(1);
auto v = src.UInt(i); auto v = src.UInt(i);
auto mask = Bitmask32(offset + count) ^ Bitmask32(offset); auto mask = Bitmask32(offset + count) ^ Bitmask32(offset);
...@@ -181,8 +181,8 @@ SpirvShader::EmitResult SpirvShader::EmitUnaryOp(InsnIterator insn, EmitState *s ...@@ -181,8 +181,8 @@ SpirvShader::EmitResult SpirvShader::EmitUnaryOp(InsnIterator insn, EmitState *s
case spv::OpBitFieldSExtract: case spv::OpBitFieldSExtract:
case spv::OpBitFieldUExtract: case spv::OpBitFieldUExtract:
{ {
auto offset = GenericValue(this, state, insn.word(4)).UInt(0); auto offset = Operand(this, state, insn.word(4)).UInt(0);
auto count = GenericValue(this, state, insn.word(5)).UInt(0); auto count = Operand(this, state, insn.word(5)).UInt(0);
auto one = SIMD::UInt(1); auto one = SIMD::UInt(1);
auto v = src.UInt(i); auto v = src.UInt(i);
SIMD::UInt out = (v >> offset) & Bitmask32(count); SIMD::UInt out = (v >> offset) & Bitmask32(count);
...@@ -320,8 +320,8 @@ SpirvShader::EmitResult SpirvShader::EmitBinaryOp(InsnIterator insn, EmitState * ...@@ -320,8 +320,8 @@ SpirvShader::EmitResult SpirvShader::EmitBinaryOp(InsnIterator insn, EmitState *
auto &type = getType(insn.word(1)); auto &type = getType(insn.word(1));
auto &dst = state->createIntermediate(insn.word(2), type.sizeInComponents); auto &dst = state->createIntermediate(insn.word(2), type.sizeInComponents);
auto &lhsType = getType(getObject(insn.word(3)).type); auto &lhsType = getType(getObject(insn.word(3)).type);
auto lhs = GenericValue(this, state, insn.word(3)); auto lhs = Operand(this, state, insn.word(3));
auto rhs = GenericValue(this, state, insn.word(4)); auto rhs = Operand(this, state, insn.word(4));
for(auto i = 0u; i < lhsType.sizeInComponents; i++) for(auto i = 0u; i < lhsType.sizeInComponents; i++)
{ {
...@@ -524,14 +524,14 @@ SpirvShader::EmitResult SpirvShader::EmitDot(InsnIterator insn, EmitState *state ...@@ -524,14 +524,14 @@ SpirvShader::EmitResult SpirvShader::EmitDot(InsnIterator insn, EmitState *state
ASSERT(type.sizeInComponents == 1); ASSERT(type.sizeInComponents == 1);
auto &dst = state->createIntermediate(insn.word(2), type.sizeInComponents); auto &dst = state->createIntermediate(insn.word(2), type.sizeInComponents);
auto &lhsType = getType(getObject(insn.word(3)).type); auto &lhsType = getType(getObject(insn.word(3)).type);
auto lhs = GenericValue(this, state, insn.word(3)); auto lhs = Operand(this, state, insn.word(3));
auto rhs = GenericValue(this, state, insn.word(4)); auto rhs = Operand(this, state, insn.word(4));
dst.move(0, Dot(lhsType.sizeInComponents, lhs, rhs)); dst.move(0, Dot(lhsType.sizeInComponents, lhs, rhs));
return EmitResult::Continue; return EmitResult::Continue;
} }
SIMD::Float SpirvShader::Dot(unsigned numComponents, GenericValue const &x, GenericValue const &y) const SIMD::Float SpirvShader::Dot(unsigned numComponents, Operand const &x, Operand const &y) const
{ {
SIMD::Float d = x.Float(0) * y.Float(0); SIMD::Float d = x.Float(0) * y.Float(0);
......
src/Pipeline/SpirvShaderControlFlow.cpp
...@@ -495,7 +495,7 @@ SpirvShader::EmitResult SpirvShader::EmitBranchConditional(InsnIterator insn, Em ...@@ -495,7 +495,7 @@ SpirvShader::EmitResult SpirvShader::EmitBranchConditional(InsnIterator insn, Em
auto trueBlockId = Block::ID(block.branchInstruction.word(2)); auto trueBlockId = Block::ID(block.branchInstruction.word(2));
auto falseBlockId = Block::ID(block.branchInstruction.word(3)); auto falseBlockId = Block::ID(block.branchInstruction.word(3));
auto cond = GenericValue(this, state, condId); auto cond = Operand(this, state, condId);
ASSERT_MSG(getType(cond.type).sizeInComponents == 1, "Condition must be a Boolean type scalar"); ASSERT_MSG(getType(cond.type).sizeInComponents == 1, "Condition must be a Boolean type scalar");
// TODO: Optimize for case where all lanes take same path. // TODO: Optimize for case where all lanes take same path.
...@@ -514,7 +514,7 @@ SpirvShader::EmitResult SpirvShader::EmitSwitch(InsnIterator insn, EmitState *st ...@@ -514,7 +514,7 @@ SpirvShader::EmitResult SpirvShader::EmitSwitch(InsnIterator insn, EmitState *st
auto selId = Object::ID(block.branchInstruction.word(1)); auto selId = Object::ID(block.branchInstruction.word(1));
auto sel = GenericValue(this, state, selId); auto sel = Operand(this, state, selId);
ASSERT_MSG(getType(sel.type).sizeInComponents == 1, "Selector must be a scalar"); ASSERT_MSG(getType(sel.type).sizeInComponents == 1, "Selector must be a scalar");
auto numCases = (block.branchInstruction.wordCount() - 3) / 2; auto numCases = (block.branchInstruction.wordCount() - 3) / 2;
...@@ -678,7 +678,7 @@ void SpirvShader::StorePhi(Block::ID currentBlock, InsnIterator insn, EmitState ...@@ -678,7 +678,7 @@ void SpirvShader::StorePhi(Block::ID currentBlock, InsnIterator insn, EmitState
} }
auto mask = GetActiveLaneMaskEdge(state, blockId, currentBlock); auto mask = GetActiveLaneMaskEdge(state, blockId, currentBlock);
auto in = GenericValue(this, state, varId); auto in = Operand(this, state, varId);
for(uint32_t i = 0; i < type.sizeInComponents; i++) for(uint32_t i = 0; i < type.sizeInComponents; i++)
{ {
......
src/Pipeline/SpirvShaderDebugger.cpp
...@@ -1203,7 +1203,7 @@ void SpirvShader::Impl::Debugger::exposeVariable( ...@@ -1203,7 +1203,7 @@ void SpirvShader::Impl::Debugger::exposeVariable(
case Object::Kind::Constant: case Object::Kind::Constant:
case Object::Kind::Intermediate: case Object::Kind::Intermediate:
{ {
auto val = GenericValue(shader, state, id).Int(wordOffset); auto val = Operand(shader, state, id).Int(wordOffset);
switch(ty->encoding) switch(ty->encoding)
{ {
...@@ -1287,7 +1287,7 @@ void SpirvShader::Impl::Debugger::exposeVariable( ...@@ -1287,7 +1287,7 @@ void SpirvShader::Impl::Debugger::exposeVariable(
} }
// No debug type information. Derive from SPIR-V. // No debug type information. Derive from SPIR-V.
GenericValue val(shader, state, id); Operand val(shader, state, id);
switch(shader->getType(val.type).opcode()) switch(shader->getType(val.type).opcode())
{ {
case spv::OpTypeInt: case spv::OpTypeInt:
......
src/Pipeline/SpirvShaderGroup.cpp
...@@ -34,7 +34,7 @@ struct SpirvShader::Impl::Group ...@@ -34,7 +34,7 @@ struct SpirvShader::Impl::Group
const I identityValue, const I identityValue,
APPLY &&apply) APPLY &&apply)
{ {
SpirvShader::GenericValue value(shader, state, insn.word(5)); SpirvShader::Operand value(shader, state, insn.word(5));
auto &type = shader->getType(SpirvShader::Type::ID(insn.word(1))); auto &type = shader->getType(SpirvShader::Type::ID(insn.word(1)));
for(auto i = 0u; i < type.sizeInComponents; i++) for(auto i = 0u; i < type.sizeInComponents; i++)
{ {
...@@ -104,21 +104,21 @@ SpirvShader::EmitResult SpirvShader::EmitGroupNonUniform(InsnIterator insn, Emit ...@@ -104,21 +104,21 @@ SpirvShader::EmitResult SpirvShader::EmitGroupNonUniform(InsnIterator insn, Emit
case spv::OpGroupNonUniformAll: case spv::OpGroupNonUniformAll:
{ {
GenericValue predicate(this, state, insn.word(4)); Operand predicate(this, state, insn.word(4));
dst.move(0, AndAll(predicate.UInt(0) | ~As<SIMD::UInt>(state->activeLaneMask()))); dst.move(0, AndAll(predicate.UInt(0) | ~As<SIMD::UInt>(state->activeLaneMask())));
break; break;
} }
case spv::OpGroupNonUniformAny: case spv::OpGroupNonUniformAny:
{ {
GenericValue predicate(this, state, insn.word(4)); Operand predicate(this, state, insn.word(4));
dst.move(0, OrAll(predicate.UInt(0) & As<SIMD::UInt>(state->activeLaneMask()))); dst.move(0, OrAll(predicate.UInt(0) & As<SIMD::UInt>(state->activeLaneMask())));
break; break;
} }
case spv::OpGroupNonUniformAllEqual: case spv::OpGroupNonUniformAllEqual:
{ {
GenericValue value(this, state, insn.word(4)); Operand value(this, state, insn.word(4));
auto res = SIMD::UInt(0xffffffff); auto res = SIMD::UInt(0xffffffff);
SIMD::UInt active = As<SIMD::UInt>(state->activeLaneMask()); SIMD::UInt active = As<SIMD::UInt>(state->activeLaneMask());
SIMD::UInt inactive = ~active; SIMD::UInt inactive = ~active;
...@@ -140,7 +140,7 @@ SpirvShader::EmitResult SpirvShader::EmitGroupNonUniform(InsnIterator insn, Emit ...@@ -140,7 +140,7 @@ SpirvShader::EmitResult SpirvShader::EmitGroupNonUniform(InsnIterator insn, Emit
{ {
auto valueId = Object::ID(insn.word(4)); auto valueId = Object::ID(insn.word(4));
auto id = SIMD::Int(GetConstScalarInt(insn.word(5))); auto id = SIMD::Int(GetConstScalarInt(insn.word(5)));
GenericValue value(this, state, valueId); Operand value(this, state, valueId);
auto mask = CmpEQ(id, SIMD::Int(0, 1, 2, 3)); auto mask = CmpEQ(id, SIMD::Int(0, 1, 2, 3));
for(auto i = 0u; i < type.sizeInComponents; i++) for(auto i = 0u; i < type.sizeInComponents; i++)
{ {
...@@ -152,7 +152,7 @@ SpirvShader::EmitResult SpirvShader::EmitGroupNonUniform(InsnIterator insn, Emit ...@@ -152,7 +152,7 @@ SpirvShader::EmitResult SpirvShader::EmitGroupNonUniform(InsnIterator insn, Emit
case spv::OpGroupNonUniformBroadcastFirst: case spv::OpGroupNonUniformBroadcastFirst:
{ {
auto valueId = Object::ID(insn.word(4)); auto valueId = Object::ID(insn.word(4));
GenericValue value(this, state, valueId); Operand value(this, state, valueId);
// Result is true only in the active invocation with the lowest id // Result is true only in the active invocation with the lowest id
// in the group, otherwise result is false. // in the group, otherwise result is false.
SIMD::Int active = state->activeLaneMask(); SIMD::Int active = state->activeLaneMask();
...@@ -170,7 +170,7 @@ SpirvShader::EmitResult SpirvShader::EmitGroupNonUniform(InsnIterator insn, Emit ...@@ -170,7 +170,7 @@ SpirvShader::EmitResult SpirvShader::EmitGroupNonUniform(InsnIterator insn, Emit
case spv::OpGroupNonUniformBallot: case spv::OpGroupNonUniformBallot:
{ {
ASSERT(type.sizeInComponents == 4); ASSERT(type.sizeInComponents == 4);
GenericValue predicate(this, state, insn.word(4)); Operand predicate(this, state, insn.word(4));
dst.move(0, SIMD::Int(SignMask(state->activeLaneMask() & predicate.Int(0)))); dst.move(0, SIMD::Int(SignMask(state->activeLaneMask() & predicate.Int(0))));
dst.move(1, SIMD::Int(0)); dst.move(1, SIMD::Int(0));
dst.move(2, SIMD::Int(0)); dst.move(2, SIMD::Int(0));
...@@ -183,7 +183,7 @@ SpirvShader::EmitResult SpirvShader::EmitGroupNonUniform(InsnIterator insn, Emit ...@@ -183,7 +183,7 @@ SpirvShader::EmitResult SpirvShader::EmitGroupNonUniform(InsnIterator insn, Emit
auto valueId = Object::ID(insn.word(4)); auto valueId = Object::ID(insn.word(4));
ASSERT(type.sizeInComponents == 1); ASSERT(type.sizeInComponents == 1);
ASSERT(getType(getObject(valueId).type).sizeInComponents == 4); ASSERT(getType(getObject(valueId).type).sizeInComponents == 4);
GenericValue value(this, state, valueId); Operand value(this, state, valueId);
auto bit = (value.Int(0) >> SIMD::Int(0, 1, 2, 3)) & SIMD::Int(1); auto bit = (value.Int(0) >> SIMD::Int(0, 1, 2, 3)) & SIMD::Int(1);
dst.move(0, -bit); dst.move(0, -bit);
break; break;
...@@ -196,8 +196,8 @@ SpirvShader::EmitResult SpirvShader::EmitGroupNonUniform(InsnIterator insn, Emit ...@@ -196,8 +196,8 @@ SpirvShader::EmitResult SpirvShader::EmitGroupNonUniform(InsnIterator insn, Emit
ASSERT(type.sizeInComponents == 1); ASSERT(type.sizeInComponents == 1);
ASSERT(getType(getObject(valueId).type).sizeInComponents == 4); ASSERT(getType(getObject(valueId).type).sizeInComponents == 4);
ASSERT(getType(getObject(indexId).type).sizeInComponents == 1); ASSERT(getType(getObject(indexId).type).sizeInComponents == 1);
GenericValue value(this, state, valueId); Operand value(this, state, valueId);
GenericValue index(this, state, indexId); Operand index(this, state, indexId);
auto vecIdx = index.Int(0) / SIMD::Int(32); auto vecIdx = index.Int(0) / SIMD::Int(32);
auto bitIdx = index.Int(0) & SIMD::Int(31); auto bitIdx = index.Int(0) & SIMD::Int(31);
auto bits = (value.Int(0) & CmpEQ(vecIdx, SIMD::Int(0))) | auto bits = (value.Int(0) & CmpEQ(vecIdx, SIMD::Int(0))) |
...@@ -214,7 +214,7 @@ SpirvShader::EmitResult SpirvShader::EmitGroupNonUniform(InsnIterator insn, Emit ...@@ -214,7 +214,7 @@ SpirvShader::EmitResult SpirvShader::EmitGroupNonUniform(InsnIterator insn, Emit
auto valueId = Object::ID(insn.word(5)); auto valueId = Object::ID(insn.word(5));
ASSERT(type.sizeInComponents == 1); ASSERT(type.sizeInComponents == 1);
ASSERT(getType(getObject(valueId).type).sizeInComponents == 4); ASSERT(getType(getObject(valueId).type).sizeInComponents == 4);
GenericValue value(this, state, valueId); Operand value(this, state, valueId);
switch(operation) switch(operation)
{ {
case spv::GroupOperationReduce: case spv::GroupOperationReduce:
...@@ -237,7 +237,7 @@ SpirvShader::EmitResult SpirvShader::EmitGroupNonUniform(InsnIterator insn, Emit ...@@ -237,7 +237,7 @@ SpirvShader::EmitResult SpirvShader::EmitGroupNonUniform(InsnIterator insn, Emit
auto valueId = Object::ID(insn.word(4)); auto valueId = Object::ID(insn.word(4));
ASSERT(type.sizeInComponents == 1); ASSERT(type.sizeInComponents == 1);
ASSERT(getType(getObject(valueId).type).sizeInComponents == 4); ASSERT(getType(getObject(valueId).type).sizeInComponents == 4);
GenericValue value(this, state, valueId); Operand value(this, state, valueId);
dst.move(0, Cttz(value.UInt(0) & SIMD::UInt(15), true)); dst.move(0, Cttz(value.UInt(0) & SIMD::UInt(15), true));
break; break;
} }
...@@ -247,15 +247,15 @@ SpirvShader::EmitResult SpirvShader::EmitGroupNonUniform(InsnIterator insn, Emit ...@@ -247,15 +247,15 @@ SpirvShader::EmitResult SpirvShader::EmitGroupNonUniform(InsnIterator insn, Emit
auto valueId = Object::ID(insn.word(4)); auto valueId = Object::ID(insn.word(4));
ASSERT(type.sizeInComponents == 1); ASSERT(type.sizeInComponents == 1);
ASSERT(getType(getObject(valueId).type).sizeInComponents == 4); ASSERT(getType(getObject(valueId).type).sizeInComponents == 4);
GenericValue value(this, state, valueId); Operand value(this, state, valueId);
dst.move(0, SIMD::UInt(31) - Ctlz(value.UInt(0) & SIMD::UInt(15), false)); dst.move(0, SIMD::UInt(31) - Ctlz(value.UInt(0) & SIMD::UInt(15), false));
break; break;
} }
case spv::OpGroupNonUniformShuffle: case spv::OpGroupNonUniformShuffle:
{ {
GenericValue value(this, state, insn.word(4)); Operand value(this, state, insn.word(4));
GenericValue id(this, state, insn.word(5)); Operand id(this, state, insn.word(5));
auto x = CmpEQ(SIMD::Int(0), id.Int(0)); auto x = CmpEQ(SIMD::Int(0), id.Int(0));
auto y = CmpEQ(SIMD::Int(1), id.Int(0)); auto y = CmpEQ(SIMD::Int(1), id.Int(0));
auto z = CmpEQ(SIMD::Int(2), id.Int(0)); auto z = CmpEQ(SIMD::Int(2), id.Int(0));
...@@ -270,8 +270,8 @@ SpirvShader::EmitResult SpirvShader::EmitGroupNonUniform(InsnIterator insn, Emit ...@@ -270,8 +270,8 @@ SpirvShader::EmitResult SpirvShader::EmitGroupNonUniform(InsnIterator insn, Emit
case spv::OpGroupNonUniformShuffleXor: case spv::OpGroupNonUniformShuffleXor:
{ {
GenericValue value(this, state, insn.word(4)); Operand value(this, state, insn.word(4));
GenericValue mask(this, state, insn.word(5)); Operand mask(this, state, insn.word(5));
auto x = CmpEQ(SIMD::Int(0), SIMD::Int(0, 1, 2, 3) ^ mask.Int(0)); auto x = CmpEQ(SIMD::Int(0), SIMD::Int(0, 1, 2, 3) ^ mask.Int(0));
auto y = CmpEQ(SIMD::Int(1), SIMD::Int(0, 1, 2, 3) ^ mask.Int(0)); auto y = CmpEQ(SIMD::Int(1), SIMD::Int(0, 1, 2, 3) ^ mask.Int(0));
auto z = CmpEQ(SIMD::Int(2), SIMD::Int(0, 1, 2, 3) ^ mask.Int(0)); auto z = CmpEQ(SIMD::Int(2), SIMD::Int(0, 1, 2, 3) ^ mask.Int(0));
...@@ -286,8 +286,8 @@ SpirvShader::EmitResult SpirvShader::EmitGroupNonUniform(InsnIterator insn, Emit ...@@ -286,8 +286,8 @@ SpirvShader::EmitResult SpirvShader::EmitGroupNonUniform(InsnIterator insn, Emit
case spv::OpGroupNonUniformShuffleUp: case spv::OpGroupNonUniformShuffleUp:
{ {
GenericValue value(this, state, insn.word(4)); Operand value(this, state, insn.word(4));
GenericValue delta(this, state, insn.word(5)); Operand delta(this, state, insn.word(5));
auto d0 = CmpEQ(SIMD::Int(0), delta.Int(0)); auto d0 = CmpEQ(SIMD::Int(0), delta.Int(0));
auto d1 = CmpEQ(SIMD::Int(1), delta.Int(0)); auto d1 = CmpEQ(SIMD::Int(1), delta.Int(0));
auto d2 = CmpEQ(SIMD::Int(2), delta.Int(0)); auto d2 = CmpEQ(SIMD::Int(2), delta.Int(0));
...@@ -302,8 +302,8 @@ SpirvShader::EmitResult SpirvShader::EmitGroupNonUniform(InsnIterator insn, Emit ...@@ -302,8 +302,8 @@ SpirvShader::EmitResult SpirvShader::EmitGroupNonUniform(InsnIterator insn, Emit
case spv::OpGroupNonUniformShuffleDown: case spv::OpGroupNonUniformShuffleDown:
{ {
GenericValue value(this, state, insn.word(4)); Operand value(this, state, insn.word(4));
GenericValue delta(this, state, insn.word(5)); Operand delta(this, state, insn.word(5));
auto d0 = CmpEQ(SIMD::Int(0), delta.Int(0)); auto d0 = CmpEQ(SIMD::Int(0), delta.Int(0));
auto d1 = CmpEQ(SIMD::Int(1), delta.Int(0)); auto d1 = CmpEQ(SIMD::Int(1), delta.Int(0));
auto d2 = CmpEQ(SIMD::Int(2), delta.Int(0)); auto d2 = CmpEQ(SIMD::Int(2), delta.Int(0));
......
src/Pipeline/SpirvShaderImage.cpp
...@@ -120,7 +120,7 @@ SpirvShader::EmitResult SpirvShader::EmitImageSample(ImageInstruction instructio ...@@ -120,7 +120,7 @@ SpirvShader::EmitResult SpirvShader::EmitImageSample(ImageInstruction instructio
auto &sampledImage = getObject(sampledImageId); auto &sampledImage = getObject(sampledImageId);
auto samplerDescriptor = (sampledImage.opcode() == spv::OpSampledImage) ? state->getPointer(sampledImage.definition.word(4)).base : imageDescriptor; auto samplerDescriptor = (sampledImage.opcode() == spv::OpSampledImage) ? state->getPointer(sampledImage.definition.word(4)).base : imageDescriptor;
auto coordinate = GenericValue(this, state, coordinateId); auto coordinate = Operand(this, state, coordinateId);
auto &coordinateType = getType(coordinate.type); auto &coordinateType = getType(coordinate.type);
Pointer<Byte> sampler = samplerDescriptor + OFFSET(vk::SampledImageDescriptor, sampler); // vk::Sampler* Pointer<Byte> sampler = samplerDescriptor + OFFSET(vk::SampledImageDescriptor, sampler); // vk::Sampler*
...@@ -224,7 +224,7 @@ SpirvShader::EmitResult SpirvShader::EmitImageSample(ImageInstruction instructio ...@@ -224,7 +224,7 @@ SpirvShader::EmitResult SpirvShader::EmitImageSample(ImageInstruction instructio
if(instruction.isDref()) if(instruction.isDref())
{ {
auto drefValue = GenericValue(this, state, insn.word(5)); auto drefValue = Operand(this, state, insn.word(5));
if(instruction.isProj()) if(instruction.isProj())
{ {
...@@ -240,14 +240,14 @@ SpirvShader::EmitResult SpirvShader::EmitImageSample(ImageInstruction instructio ...@@ -240,14 +240,14 @@ SpirvShader::EmitResult SpirvShader::EmitImageSample(ImageInstruction instructio
if(lodOrBias) if(lodOrBias)
{ {
auto lodValue = GenericValue(this, state, lodOrBiasId); auto lodValue = Operand(this, state, lodOrBiasId);
in[i] = lodValue.Float(0); in[i] = lodValue.Float(0);
i++; i++;
} }
else if(grad) else if(grad)
{ {
auto dxValue = GenericValue(this, state, gradDxId); auto dxValue = Operand(this, state, gradDxId);
auto dyValue = GenericValue(this, state, gradDyId); auto dyValue = Operand(this, state, gradDyId);
auto &dxyType = getType(dxValue.type); auto &dxyType = getType(dxValue.type);
ASSERT(dxyType.sizeInComponents == getType(dyValue.type).sizeInComponents); ASSERT(dxyType.sizeInComponents == getType(dyValue.type).sizeInComponents);
...@@ -274,7 +274,7 @@ SpirvShader::EmitResult SpirvShader::EmitImageSample(ImageInstruction instructio ...@@ -274,7 +274,7 @@ SpirvShader::EmitResult SpirvShader::EmitImageSample(ImageInstruction instructio
if(constOffset) if(constOffset)
{ {
auto offsetValue = GenericValue(this, state, offsetId); auto offsetValue = Operand(this, state, offsetId);
auto &offsetType = getType(offsetValue.type); auto &offsetType = getType(offsetValue.type);
instruction.offset = offsetType.sizeInComponents; instruction.offset = offsetType.sizeInComponents;
...@@ -287,7 +287,7 @@ SpirvShader::EmitResult SpirvShader::EmitImageSample(ImageInstruction instructio ...@@ -287,7 +287,7 @@ SpirvShader::EmitResult SpirvShader::EmitImageSample(ImageInstruction instructio
if(sample) if(sample)
{ {
auto sampleValue = GenericValue(this, state, sampleId); auto sampleValue = Operand(this, state, sampleId);
in[i] = As<SIMD::Float>(sampleValue.Int(0)); in[i] = As<SIMD::Float>(sampleValue.Int(0));
} }
...@@ -386,7 +386,7 @@ void SpirvShader::GetImageDimensions(EmitState const *state, Type const &resultT ...@@ -386,7 +386,7 @@ void SpirvShader::GetImageDimensions(EmitState const *state, Type const &resultT
std::vector<Int> out; std::vector<Int> out;
if(lodId != 0) if(lodId != 0)
{ {
auto lodVal = GenericValue(this, state, lodId); auto lodVal = Operand(this, state, lodId);
ASSERT(getType(lodVal.type).sizeInComponents == 1); ASSERT(getType(lodVal.type).sizeInComponents == 1);
auto lod = lodVal.Int(0); auto lod = lodVal.Int(0);
auto one = SIMD::Int(1); auto one = SIMD::Int(1);
...@@ -477,7 +477,7 @@ SpirvShader::EmitResult SpirvShader::EmitImageQuerySamples(InsnIterator insn, Em ...@@ -477,7 +477,7 @@ SpirvShader::EmitResult SpirvShader::EmitImageQuerySamples(InsnIterator insn, Em
return EmitResult::Continue; return EmitResult::Continue;
} }
SIMD::Pointer SpirvShader::GetTexelAddress(EmitState const *state, SIMD::Pointer ptr, GenericValue const &coordinate, Type const &imageType, Pointer<Byte> descriptor, int texelSize, Object::ID sampleId, bool useStencilAspect) const SIMD::Pointer SpirvShader::GetTexelAddress(EmitState const *state, SIMD::Pointer ptr, Operand const &coordinate, Type const &imageType, Pointer<Byte> descriptor, int texelSize, Object::ID sampleId, bool useStencilAspect) const
{ {
auto routine = state->routine; auto routine = state->routine;
bool isArrayed = imageType.definition.word(5) != 0; bool isArrayed = imageType.definition.word(5) != 0;
...@@ -532,7 +532,7 @@ SIMD::Pointer SpirvShader::GetTexelAddress(EmitState const *state, SIMD::Pointer ...@@ -532,7 +532,7 @@ SIMD::Pointer SpirvShader::GetTexelAddress(EmitState const *state, SIMD::Pointer
if(sampleId.value()) if(sampleId.value())
{ {
GenericValue sample(this, state, sampleId); Operand sample(this, state, sampleId);
ptr += sample.Int(0) * samplePitch; ptr += sample.Int(0) * samplePitch;
} }
...@@ -566,7 +566,7 @@ SpirvShader::EmitResult SpirvShader::EmitImageRead(InsnIterator insn, EmitState ...@@ -566,7 +566,7 @@ SpirvShader::EmitResult SpirvShader::EmitImageRead(InsnIterator insn, EmitState
ASSERT(imageType.definition.opcode() == spv::OpTypeImage); ASSERT(imageType.definition.opcode() == spv::OpTypeImage);
auto dim = static_cast<spv::Dim>(imageType.definition.word(3)); auto dim = static_cast<spv::Dim>(imageType.definition.word(3));
auto coordinate = GenericValue(this, state, insn.word(4)); auto coordinate = Operand(this, state, insn.word(4));
const DescriptorDecorations &d = descriptorDecorations.at(imageId); const DescriptorDecorations &d = descriptorDecorations.at(imageId);
// For subpass data, format in the instruction is spv::ImageFormatUnknown. Get it from // For subpass data, format in the instruction is spv::ImageFormatUnknown. Get it from
...@@ -855,8 +855,8 @@ SpirvShader::EmitResult SpirvShader::EmitImageWrite(InsnIterator insn, EmitState ...@@ -855,8 +855,8 @@ SpirvShader::EmitResult SpirvShader::EmitImageWrite(InsnIterator insn, EmitState
// TODO(b/131171141): Not handling any image operands yet. // TODO(b/131171141): Not handling any image operands yet.
ASSERT(insn.wordCount() == 4); ASSERT(insn.wordCount() == 4);
auto coordinate = GenericValue(this, state, insn.word(2)); auto coordinate = Operand(this, state, insn.word(2));
auto texel = GenericValue(this, state, insn.word(3)); auto texel = Operand(this, state, insn.word(3));
Pointer<Byte> binding = state->getPointer(imageId).base; Pointer<Byte> binding = state->getPointer(imageId).base;
Pointer<Byte> imageBase = *Pointer<Pointer<Byte>>(binding + OFFSET(vk::StorageImageDescriptor, ptr)); Pointer<Byte> imageBase = *Pointer<Pointer<Byte>>(binding + OFFSET(vk::StorageImageDescriptor, ptr));
...@@ -1007,7 +1007,7 @@ SpirvShader::EmitResult SpirvShader::EmitImageTexelPointer(InsnIterator insn, Em ...@@ -1007,7 +1007,7 @@ SpirvShader::EmitResult SpirvShader::EmitImageTexelPointer(InsnIterator insn, Em
ASSERT(resultType.storageClass == spv::StorageClassImage); ASSERT(resultType.storageClass == spv::StorageClassImage);
ASSERT(getType(resultType.element).opcode() == spv::OpTypeInt); ASSERT(getType(resultType.element).opcode() == spv::OpTypeInt);
auto coordinate = GenericValue(this, state, insn.word(4)); auto coordinate = Operand(this, state, insn.word(4));
Pointer<Byte> binding = state->getPointer(imageId).base; Pointer<Byte> binding = state->getPointer(imageId).base;
Pointer<Byte> imageBase = *Pointer<Pointer<Byte>>(binding + OFFSET(vk::StorageImageDescriptor, ptr)); Pointer<Byte> imageBase = *Pointer<Pointer<Byte>>(binding + OFFSET(vk::StorageImageDescriptor, ptr));
......
src/Pipeline/SpirvShaderMemory.cpp
...@@ -236,7 +236,7 @@ SpirvShader::EmitResult SpirvShader::EmitVariable(InsnIterator insn, EmitState * ...@@ -236,7 +236,7 @@ SpirvShader::EmitResult SpirvShader::EmitVariable(InsnIterator insn, EmitState *
{ {
bool interleavedByLane = IsStorageInterleavedByLane(objectTy.storageClass); bool interleavedByLane = IsStorageInterleavedByLane(objectTy.storageClass);
auto ptr = GetPointerToData(resultId, 0, state); auto ptr = GetPointerToData(resultId, 0, state);
GenericValue initialValue(this, state, initializerId); Operand initialValue(this, state, initializerId);
VisitMemoryObject(resultId, [&](const MemoryElement &el) { VisitMemoryObject(resultId, [&](const MemoryElement &el) {
auto p = ptr + el.offset; auto p = ptr + el.offset;
if(interleavedByLane) { p = InterleaveByLane(p); } if(interleavedByLane) { p = InterleaveByLane(p); }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment