AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

calculate program hash in bulk

Browse Source 
Now that Builder::Instructions are dense, it's easier to just calculate
Builder::hash() all at once when requested rather than as we go along.

(I'm planning to move the other use of Builder::Instruction hashing to
optimize() later too.)

Change-Id: I3124da5a3905291a907d08a12f62e794ed88e92d
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/269184
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Herb Derby <herb@google.com>
This commit is contained in:
Mike Klein 2020-02-06 13:41:57 -06:00 committed by Skia Commit-Bot
parent ed9b1f1c1e
commit c90a8c72af
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/core/SkVM.cpp
View File

@ -455,6 +455,12 @@ namespace skvm {
return {this->optimize(), fStrides, debug_name};
}
uint64_t Builder::hash() const {
uint32_t lo = SkOpts::hash(fProgram.data(), fProgram.size() * sizeof(Instruction), 0),
hi = SkOpts::hash(fProgram.data(), fProgram.size() * sizeof(Instruction), 1);
return (uint64_t)lo | (uint64_t)hi << 32;
}
static bool operator==(const Builder::Instruction& a, const Builder::Instruction& b) {
return a.op == b.op
&& a.x == b.x
@ -468,19 +474,12 @@ namespace skvm {
return SkOpts::hash(&inst, sizeof(inst), seed);
}
uint64_t Builder::hash() const { return (uint64_t)fHashLo | (uint64_t)fHashHi << 32; }
// Most instructions produce a value and return it by ID,
// the value-producing instruction's own index in the program vector.
Val Builder::push(Op op, Val x, Val y, Val z, int immy, int immz) {
Instruction inst{op, x, y, z, immy, immz};
// This first InstructionHash{}() call should be free given we're about to use fIndex below.
fHashLo ^= InstructionHash{}(inst, 0); // Two hash streams with different seeds.
fHashHi ^= InstructionHash{}(inst, 1);
fHashLo = SkChecksum::CheapMix(fHashLo); // Mix to make sure instruction order matters.
fHashHi = SkChecksum::CheapMix(fHashHi);
// Basic common subexpression elimination:
// if we've already seen this exact Instruction, use it instead of creating a new one.
if (Val* id = fIndex.find(inst)) {

2
src/core/SkVM.h
View File

@ -575,8 +575,6 @@ namespace skvm {
SkTHashMap<Instruction, Val, InstructionHash> fIndex;
std::vector<Instruction> fProgram;
std::vector<int> fStrides;
uint32_t fHashLo{0},
fHashHi{0};
};
// Helper to streamline allocating and working with uniforms.