Skip to content

Commit

Permalink
s2: Remove BP saving by using upgraded avo (#366)
Browse files Browse the repository at this point in the history 
The new avo version avoids using BP, so it no longer needs to be spilled.
  • Loading branch information
@klauspost
klauspost authored Apr 26, 2021
1 parent e48015b commit 5fe15d9
Show file tree
Hide file tree
Showing 4 changed files with 5,739 additions and 5,765 deletions.
20 changes: 0 additions & 20 deletions s2/_generate/gen.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1524,7 +1524,6 @@ func (o options) genEmitLiteral() {
Pragma("noescape")

dstBase, litBase, litLen, retval := GP64(), GP64(), GP64(), GP64()
restore := saveBP()
Load(Param("lit").Len(), litLen)
Load(Param("dst").Base(), dstBase)
Load(Param("lit").Base(), litBase)
Expand All @@ -1537,7 +1536,6 @@ func (o options) genEmitLiteral() {

Label("emit_literal_end_standalone")
Store(retval, ReturnIndex(0))
restore()
RET()

}
Expand Down Expand Up @@ -1694,7 +1692,6 @@ func (o options) genEmitRepeat() {
Pragma("noescape")

dstBase, offset, length, retval := GP64(), GP64(), GP64(), GP64()
restore := saveBP()

// retval = 0
XORQ(retval, retval)
Expand All @@ -1705,7 +1702,6 @@ func (o options) genEmitRepeat() {
o.emitRepeat("standalone", length, offset, retval, dstBase, LabelRef("gen_emit_repeat_end"))
Label("gen_emit_repeat_end")
Store(retval, ReturnIndex(0))
restore()
RET()
}

Expand Down Expand Up @@ -1851,7 +1847,6 @@ func (o options) genEmitCopy() {
Pragma("noescape")

dstBase, offset, length, retval := GP64(), GP64(), GP64(), GP64()
restore := saveBP()

// i := 0
XORQ(retval, retval)
Expand All @@ -1861,7 +1856,6 @@ func (o options) genEmitCopy() {
o.emitCopy("standalone", length, offset, retval, dstBase, LabelRef("gen_emit_copy_end"))
Label("gen_emit_copy_end")
Store(retval, ReturnIndex(0))
restore()
RET()
}

Expand All @@ -1883,7 +1877,6 @@ func (o options) genEmitCopyNoRepeat() {
Pragma("noescape")

dstBase, offset, length, retval := GP64(), GP64(), GP64(), GP64()
restore := saveBP()

// i := 0
XORQ(retval, retval)
Expand All @@ -1894,7 +1887,6 @@ func (o options) genEmitCopyNoRepeat() {
o.emitCopy("standalone_snappy", length, offset, retval, dstBase, "gen_emit_copy_end_snappy")
Label("gen_emit_copy_end_snappy")
Store(retval, ReturnIndex(0))
restore()
RET()
}

Expand Down Expand Up @@ -2398,15 +2390,12 @@ func (o options) genMatchLen() {

aBase, bBase, length := GP64(), GP64(), GP64()

restore := saveBP()

Load(Param("a").Base(), aBase)
Load(Param("b").Base(), bBase)
Load(Param("a").Len(), length)
l := o.matchLen("standalone", aBase, bBase, length, LabelRef("gen_match_len_end"))
Label("gen_match_len_end")
Store(l.As64(), ReturnIndex(0))
restore()
RET()
}

Expand Down Expand Up @@ -2552,12 +2541,3 @@ func (o options) matchLenAlt(name string, a, b, len reg.GPVirtual, end LabelRef)
JMP(end)
return matched
}

// saveBP will save RBP in an XMM register and restore it when returning.
func saveBP() (restore func()) {
x := XMM()
MOVQ(reg.RBP, x)
return func() {
MOVQ(x, reg.RBP)
}
}
2 changes: 1 addition & 1 deletion s2/_generate/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ module github.com/klauspost/compress/s2/_generate

go 1.13

require github.com/mmcloughlin/avo v0.0.0-20200523190732-4439b6b2c061
require github.com/mmcloughlin/avo v0.2.0
30 changes: 19 additions & 11 deletions s2/_generate/go.sum
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,31 @@
github.com/mmcloughlin/avo v0.0.0-20200523190732-4439b6b2c061 h1:UCU8+cLbbvyxi0sQ9fSeoEhZgvrrD9HKMtX6Gmc1vk8=
github.com/mmcloughlin/avo v0.0.0-20200523190732-4439b6b2c061/go.mod h1:wqKykBG2QzQDJEzvRkcS8x6MiSJkF52hXZsXcjaB3ls=
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
golang.org/x/arch v0.0.0-20190909030613-46d78d1859ac/go.mod h1:flIaEI6LNU6xOCD5PaJvn9wGP0agmIOqjrtsKGRguv4=
github.com/mmcloughlin/avo v0.2.0 h1:6vhoSaKtxb6f4RiH+LK2qL6GSMpFzhEwJYTTSZNy09w=
github.com/mmcloughlin/avo v0.2.0/go.mod h1:5tidO2Z9Z7N6X7UMcGg+1KTj51O8OxYDCMHxCZTVpEA=
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
golang.org/x/arch v0.0.0-20210405154355-08b684f594a5/go.mod h1:flIaEI6LNU6xOCD5PaJvn9wGP0agmIOqjrtsKGRguv4=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57 h1:F5Gozwx4I1xtr/sr/8CFbb57iKi3297KFs0QDbGN60A=
golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20200425043458-8463f397d07c h1:iHhCR0b26amDCiiO+kBguKZom9aMF+NrFxh9zeKR/XU=
golang.org/x/tools v0.0.0-20200425043458-8463f397d07c/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
golang.org/x/tools v0.1.0 h1:po9/4sTYwZU9lPhi1tOrb4hCv3qrhiQ77LZfGa2OjwY=
golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
Loading

0 comments on commit 5fe15d9

Please sign in to comment.