Revert "added more SPIR-V RelaxedPrecision decorations"
This reverts commit 151a883e86c3e81924312dbc2a9e3dabcb990b12.
Reason for revert: lots of broken GMs
Original change's description:
> added more SPIR-V RelaxedPrecision decorations
>
> Bug: skia:
> Change-Id: I5717dc2c6d78f5a09ad4e948a73414fe514a4613
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/208513
> Reviewed-by: Greg Daniel <egdaniel@google.com>
> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
TBR=egdaniel@google.com,ethannicholas@google.com
Change-Id: Ia58f99a30a6c2cbe1593c56a368d6fb7930d7006
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/208862
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
diff --git a/src/sksl/SkSLSPIRVCodeGenerator.cpp b/src/sksl/SkSLSPIRVCodeGenerator.cpp
index 185f52f..c688594 100644
--- a/src/sksl/SkSLSPIRVCodeGenerator.cpp
+++ b/src/sksl/SkSLSPIRVCodeGenerator.cpp
@@ -389,19 +389,18 @@
}
size_t offset = 0;
for (int32_t i = 0; i < (int32_t) type.fields().size(); i++) {
- const Type::Field& field = type.fields()[i];
- size_t size = memoryLayout.size(*field.fType);
- size_t alignment = memoryLayout.alignment(*field.fType);
- const Layout& fieldLayout = field.fModifiers.fLayout;
+ size_t size = memoryLayout.size(*type.fields()[i].fType);
+ size_t alignment = memoryLayout.alignment(*type.fields()[i].fType);
+ const Layout& fieldLayout = type.fields()[i].fModifiers.fLayout;
if (fieldLayout.fOffset >= 0) {
if (fieldLayout.fOffset < (int) offset) {
fErrors.error(type.fOffset,
- "offset of field '" + field.fName + "' must be at "
+ "offset of field '" + type.fields()[i].fName + "' must be at "
"least " + to_string((int) offset));
}
if (fieldLayout.fOffset % alignment) {
fErrors.error(type.fOffset,
- "offset of field '" + field.fName + "' must be a multiple"
+ "offset of field '" + type.fields()[i].fName + "' must be a multiple"
" of " + to_string((int) alignment));
}
offset = fieldLayout.fOffset;
@@ -411,25 +410,21 @@
offset += alignment - mod;
}
}
- this->writeInstruction(SpvOpMemberName, resultId, i, field.fName, fNameBuffer);
+ this->writeInstruction(SpvOpMemberName, resultId, i, type.fields()[i].fName, fNameBuffer);
this->writeLayout(fieldLayout, resultId, i);
- if (field.fModifiers.fLayout.fBuiltin < 0) {
+ if (type.fields()[i].fModifiers.fLayout.fBuiltin < 0) {
this->writeInstruction(SpvOpMemberDecorate, resultId, (SpvId) i, SpvDecorationOffset,
(SpvId) offset, fDecorationBuffer);
}
- if (field.fType->kind() == Type::kMatrix_Kind) {
+ if (type.fields()[i].fType->kind() == Type::kMatrix_Kind) {
this->writeInstruction(SpvOpMemberDecorate, resultId, i, SpvDecorationColMajor,
fDecorationBuffer);
this->writeInstruction(SpvOpMemberDecorate, resultId, i, SpvDecorationMatrixStride,
- (SpvId) memoryLayout.stride(*field.fType),
+ (SpvId) memoryLayout.stride(*type.fields()[i].fType),
fDecorationBuffer);
}
- if (!field.fType->highPrecision()) {
- this->writeInstruction(SpvOpMemberDecorate, resultId, (SpvId) i,
- SpvDecorationRelaxedPrecision, fDecorationBuffer);
- }
offset += size;
- Type::Kind kind = field.fType->kind();
+ Type::Kind kind = type.fields()[i].fType->kind();
if ((kind == Type::kArray_Kind || kind == Type::kStruct_Kind) && offset % alignment != 0) {
offset += alignment - offset % alignment;
}
@@ -768,7 +763,6 @@
for (int i = 0; i < vectorSize; i++) {
this->writeWord(raw, out);
}
- this->writePrecisionModifier(a->fType, vector);
result.push_back(vector);
} else {
result.push_back(raw);
@@ -1138,7 +1132,6 @@
for (int row = 0; row < type.columns(); row++) {
this->writeWord(row == column ? diagonal : zeroId, out);
}
- this->writePrecisionModifier(type, columnId);
}
this->writeOpCode(SpvOpCompositeConstruct, 3 + type.columns(),
out);
@@ -1147,7 +1140,6 @@
for (SpvId id : columnIds) {
this->writeWord(id, out);
}
- this->writePrecisionModifier(type, id);
}
void SPIRVCodeGenerator::writeMatrixCopy(SpvId id, SpvId src, const Type& srcType,
@@ -1178,7 +1170,6 @@
// we're still inside the src matrix, copy the column
SpvId srcColumn = this->nextId();
this->writeInstruction(SpvOpCompositeExtract, srcColumnType, srcColumn, src, i, out);
- this->writePrecisionModifier(dstType, srcColumn);
SpvId dstColumn;
if (srcType.rows() == dstType.rows()) {
// columns are equal size, don't need to do anything
@@ -1195,7 +1186,6 @@
for (int i = 0; i < delta; ++i) {
this->writeWord(zeroId, out);
}
- this->writePrecisionModifier(dstType, dstColumn);
}
else {
// dst column is smaller, need to swizzle the src column
@@ -1209,7 +1199,6 @@
for (int i = 0; i < count; i++) {
this->writeWord(i, out);
}
- this->writePrecisionModifier(dstType, dstColumn);
}
columns[i] = dstColumn;
} else {
@@ -1222,7 +1211,6 @@
for (int i = 0; i < dstType.rows(); ++i) {
this->writeWord(zeroId, out);
}
- this->writePrecisionModifier(dstType, zeroColumn);
}
columns[i] = zeroColumn;
}
@@ -1233,11 +1221,9 @@
for (int i = 0; i < dstType.columns(); i++) {
this->writeWord(columns[i], out);
}
- this->writePrecisionModifier(dstType, id);
}
-void SPIRVCodeGenerator::addColumnEntry(SpvId columnType, Precision precision,
- std::vector<SpvId>* currentColumn,
+void SPIRVCodeGenerator::addColumnEntry(SpvId columnType, std::vector<SpvId>* currentColumn,
std::vector<SpvId>* columnIds,
int* currentCount, int rows, SpvId entry,
OutputStream& out) {
@@ -1255,7 +1241,6 @@
this->writeWord(id, out);
}
currentColumn->clear();
- this->writePrecisionModifier(precision, columnId);
}
}
@@ -1297,7 +1282,6 @@
std::vector<SpvId> currentColumn;
// the total number of scalars represented by currentColumn's entries
int currentCount = 0;
- Precision precision = c.fType.highPrecision() ? Precision::kHigh : Precision::kLow;
for (size_t i = 0; i < arguments.size(); i++) {
if (currentCount == 0 && c.fArguments[i]->fType.kind() == Type::kVector_Kind &&
c.fArguments[i]->fType.columns() == c.fType.rows()) {
@@ -1305,16 +1289,16 @@
columnIds.push_back(arguments[i]);
} else {
if (c.fArguments[i]->fType.columns() == 1) {
- this->addColumnEntry(columnType, precision, ¤tColumn, &columnIds,
- ¤tCount, rows, arguments[i], out);
+ this->addColumnEntry(columnType, ¤tColumn, &columnIds, ¤tCount,
+ rows, arguments[i], out);
} else {
SpvId componentType = this->getType(c.fArguments[i]->fType.componentType());
for (int j = 0; j < c.fArguments[i]->fType.columns(); ++j) {
SpvId swizzle = this->nextId();
this->writeInstruction(SpvOpCompositeExtract, componentType, swizzle,
arguments[i], j, out);
- this->addColumnEntry(columnType, precision, ¤tColumn, &columnIds,
- ¤tCount, rows, swizzle, out);
+ this->addColumnEntry(columnType, ¤tColumn, &columnIds, ¤tCount,
+ rows, swizzle, out);
}
}
}
@@ -1327,7 +1311,6 @@
this->writeWord(id, out);
}
}
- this->writePrecisionModifier(c.fType, result);
return result;
}
@@ -2519,63 +2502,55 @@
}
SpvId SPIRVCodeGenerator::writeIntLiteral(const IntLiteral& i) {
- ConstantType type;
if (i.fType == *fContext.fInt_Type) {
- type = ConstantType::kInt;
- } else if (i.fType == *fContext.fUInt_Type) {
- type = ConstantType::kUInt;
- } else if (i.fType == *fContext.fShort_Type) {
- type = ConstantType::kShort;
- } else if (i.fType == *fContext.fUShort_Type) {
- type = ConstantType::kUShort;
+ auto entry = fIntConstants.find(i.fValue);
+ if (entry == fIntConstants.end()) {
+ SpvId result = this->nextId();
+ this->writeInstruction(SpvOpConstant, this->getType(i.fType), result, (SpvId) i.fValue,
+ fConstantBuffer);
+ fIntConstants[i.fValue] = result;
+ return result;
+ }
+ return entry->second;
+ } else {
+ SkASSERT(i.fType == *fContext.fUInt_Type);
+ auto entry = fUIntConstants.find(i.fValue);
+ if (entry == fUIntConstants.end()) {
+ SpvId result = this->nextId();
+ this->writeInstruction(SpvOpConstant, this->getType(i.fType), result, (SpvId) i.fValue,
+ fConstantBuffer);
+ fUIntConstants[i.fValue] = result;
+ return result;
+ }
+ return entry->second;
}
- std::pair<ConstantValue, ConstantType> key(i.fValue, type);
- auto entry = fNumberConstants.find(key);
- if (entry == fNumberConstants.end()) {
- SpvId result = this->nextId();
- this->writeInstruction(SpvOpConstant, this->getType(i.fType), result, (SpvId) i.fValue,
- fConstantBuffer);
- this->writePrecisionModifier(i.fType, result);
- fNumberConstants[key] = result;
- return result;
- }
- return entry->second;
}
SpvId SPIRVCodeGenerator::writeFloatLiteral(const FloatLiteral& f) {
if (f.fType != *fContext.fDouble_Type) {
- ConstantType type;
- if (f.fType == *fContext.fHalf_Type) {
- type = ConstantType::kHalf;
- } else {
- type = ConstantType::kFloat;
- }
float value = (float) f.fValue;
- std::pair<ConstantValue, ConstantType> key(f.fValue, type);
- auto entry = fNumberConstants.find(key);
- if (entry == fNumberConstants.end()) {
+ auto entry = fFloatConstants.find(value);
+ if (entry == fFloatConstants.end()) {
SpvId result = this->nextId();
uint32_t bits;
SkASSERT(sizeof(bits) == sizeof(value));
memcpy(&bits, &value, sizeof(bits));
this->writeInstruction(SpvOpConstant, this->getType(f.fType), result, bits,
fConstantBuffer);
- this->writePrecisionModifier(f.fType, result);
- fNumberConstants[key] = result;
+ fFloatConstants[value] = result;
return result;
}
return entry->second;
} else {
- std::pair<ConstantValue, ConstantType> key(f.fValue, ConstantType::kDouble);
- auto entry = fNumberConstants.find(key);
- if (entry == fNumberConstants.end()) {
+ auto entry = fDoubleConstants.find(f.fValue);
+ if (entry == fDoubleConstants.end()) {
SpvId result = this->nextId();
uint64_t bits;
SkASSERT(sizeof(bits) == sizeof(f.fValue));
memcpy(&bits, &f.fValue, sizeof(bits));
this->writeInstruction(SpvOpConstant, this->getType(f.fType), result,
bits & 0xffffffff, bits >> 32, fConstantBuffer);
- fNumberConstants[key] = result;
+ fDoubleConstants[f.fValue] = result;
return result;
}
return entry->second;
diff --git a/src/sksl/SkSLSPIRVCodeGenerator.h b/src/sksl/SkSLSPIRVCodeGenerator.h
index 26560d5..0dcbadc 100644
--- a/src/sksl/SkSLSPIRVCodeGenerator.h
+++ b/src/sksl/SkSLSPIRVCodeGenerator.h
@@ -42,42 +42,6 @@
#include "ir/SkSLWhileStatement.h"
#include "spirv.h"
-union ConstantValue {
- ConstantValue(int64_t i)
- : fInt(i) {}
-
- ConstantValue(double d)
- : fDouble(d) {}
-
- bool operator==(const ConstantValue& other) const {
- return fInt == other.fInt;
- }
-
- int64_t fInt;
- double fDouble;
-};
-
-enum class ConstantType {
- kInt,
- kUInt,
- kShort,
- kUShort,
- kFloat,
- kDouble,
- kHalf,
-};
-
-namespace std {
-
-template <>
-struct hash<std::pair<ConstantValue, ConstantType>> {
- size_t operator()(const std::pair<ConstantValue, ConstantType>& key) const {
- return key.first.fInt ^ (int) key.second;
- }
-};
-
-}
-
namespace SkSL {
#define kLast_Capability SpvCapabilityMultiViewport
@@ -235,7 +199,7 @@
void writeMatrixCopy(SpvId id, SpvId src, const Type& srcType, const Type& dstType,
OutputStream& out);
- void addColumnEntry(SpvId columnType, Precision precision, std::vector<SpvId>* currentColumn,
+ void addColumnEntry(SpvId columnType, std::vector<SpvId>* currentColumn,
std::vector<SpvId>* columnIds, int* currentCount, int rows, SpvId entry,
OutputStream& out);
@@ -380,7 +344,10 @@
SpvId fBoolTrue;
SpvId fBoolFalse;
- std::unordered_map<std::pair<ConstantValue, ConstantType>, SpvId> fNumberConstants;
+ std::unordered_map<int64_t, SpvId> fIntConstants;
+ std::unordered_map<uint64_t, SpvId> fUIntConstants;
+ std::unordered_map<float, SpvId> fFloatConstants;
+ std::unordered_map<double, SpvId> fDoubleConstants;
// The constant float2(0, 1), used in swizzling
SpvId fConstantZeroOneVector = 0;
bool fSetupFragPosition;
