Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

zstd: Revert #699 #700

Merged
merged 1 commit into from Nov 27, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 15 additions & 17 deletions zstd/enc_best.go
Expand Up @@ -38,29 +38,27 @@ type match struct {
const highScore = 25000

// estBits will estimate output bits from predefined tables.
func (m *match) estBits(bitsPerByte int32, ofc, mlc uint8) {
func (m *match) estBits(bitsPerByte int32) {
mlc := mlCode(uint32(m.length - zstdMinMatch))
var ofc uint8
if m.rep < 0 {
ofc = ofCode(uint32(m.s-m.offset) + 3)
} else {
ofc = ofCode(uint32(m.rep))
}
// Cost, excluding
ofTT, mlTT := fsePredefEnc[tableOffsets].ct.symbolTT[ofc], fsePredefEnc[tableMatchLengths].ct.symbolTT[mlc]

// Add cost of match encoding...
est := int32(ofTT.outBits + mlTT.outBits)
est += int32(ofTT.deltaNbBits>>16 + mlTT.deltaNbBits>>16)
m.est = int32(ofTT.outBits + mlTT.outBits)
m.est += int32(ofTT.deltaNbBits>>16 + mlTT.deltaNbBits>>16)
// Subtract savings compared to literal encoding...
length := m.length
est -= (length * bitsPerByte) >> 10
if est > 0 {
m.est -= (m.length * bitsPerByte) >> 10
if m.est > 0 {
// Unlikely gain..
est, length = highScore, 0
}
m.est, m.length = est, length
}

func (m *match) ofCode() uint8 {
offset := uint32(m.rep)
if offset < 0 {
offset = uint32(m.s-m.offset) + 3
m.length = 0
m.est = highScore
}
return ofCode(offset)
}

// bestFastEncoder uses 2 tables, one for short matches (5 bytes) and one for long matches.
Expand Down Expand Up @@ -218,7 +216,7 @@ encodeLoop:
}
}
m := match{offset: offset, s: s, length: 4 + e.matchlen(s+4, offset+4, src), rep: rep}
m.estBits(bitsPerByte, m.ofCode(), mlCode(uint32(m.length-zstdMinMatch)))
m.estBits(bitsPerByte)
return m
}

Expand Down