Reported: https://github.com/cloudflare/sidh/issues/21 See also: https://github.com/golang/go/issues/28230fix_vendoring1
@@ -43,11 +43,11 @@ copy-target-%: | |||
prep_targets: build_env $(addprefix copy-target-, $(TARGETS)) | |||
install-%: prep_targets | |||
GOPATH=$(GOPATH_LOCAL) $(GO) install $(OPTS) $(GOPATH_DIR)/$* | |||
GOPATH=$(GOPATH_LOCAL) GOARCH=$(GOARCH) $(GO) install $(OPTS) $(GOPATH_DIR)/$* | |||
test-%: prep_targets | |||
GOPATH=$(GOPATH_LOCAL) $(GO) vet $(GOPATH_DIR)/$* | |||
GOPATH=$(GOPATH_LOCAL) $(GO) test $(OPTS) $(GOPATH_DIR)/$* | |||
GOPATH=$(GOPATH_LOCAL) GOARCH=$(GOARCH) $(GO) test $(OPTS) $(GOPATH_DIR)/$* | |||
bench-%: prep_targets | |||
GOMAXPROCS=1 GOPATH=$(GOPATH_LOCAL) $(GO) test $(OPTS) $(GOPATH_DIR)/$* $(BENCH_OPTS) | |||
@@ -70,8 +70,6 @@ vendor: clean | |||
# This swaps all imports with github.com to github_com, so that standard library doesn't | |||
# try to access external libraries. | |||
find $(VENDOR_DIR) -type f -iname "*.go" -print0 | xargs -0 sed -i 's/github\.com/github_com/g' | |||
# Similar as above, but specific to assembly files. When referencing variable from assembly code | |||
find $(VENDOR_DIR) -type f -iname "*.s" -print0 | xargs -0 sed -i 's/github·com/vendor∕github_com/g' | |||
bench: $(addprefix bench-, $(TARGETS)) | |||
cover: $(addprefix cover-, $(TARGETS)) | |||
@@ -10,8 +10,8 @@ package utils | |||
// Signals support for MULX which is in BMI2 | |||
var HasBMI2 bool | |||
// Signals support for ADX and BMI2 | |||
var HasADXandBMI2 bool | |||
// Signals support for ADX | |||
var HasADX bool | |||
// Performs CPUID and returns values of registers | |||
// go:nosplit | |||
@@ -31,7 +31,7 @@ func RecognizeCpu() { | |||
_, ebx, _, _ := cpuid(7, 0) | |||
HasBMI2 = bitn(ebx, 19) | |||
HasADXandBMI2 = bitn(ebx, 7) && HasBMI2 | |||
HasADX = bitn(ebx, 7) | |||
} | |||
func init() { | |||
@@ -1,8 +0,0 @@ | |||
// +build !noasm | |||
// This file is here because the Go language specification requires that a | |||
// package has one or more source files. Now there is always a valid package. | |||
// Otherwise all source files would be excluded by the build constraints for | |||
// the arm64 build. | |||
// https://golang.org/ref/spec#Packages | |||
package utils |
@@ -0,0 +1,16 @@ | |||
// +build amd64 | |||
package p503 | |||
import cpu "github.com/cloudflare/sidh/internal/utils" | |||
// Signals support for MULX which is in BMI2 | |||
var HasBMI2 bool | |||
// Signals support for ADX and BMI2 | |||
var HasADXandBMI2 bool | |||
func init() { | |||
HasBMI2 = cpu.HasBMI2 | |||
HasADXandBMI2 = cpu.HasBMI2 && cpu.HasADX | |||
} |
@@ -697,9 +697,9 @@ TEXT ·fp503Mul(SB), NOSPLIT, $104-24 | |||
MOVQ y+16(FP), REG_P2 | |||
// Check wether to use optimized implementation | |||
CMPB github·com∕cloudflare∕sidh∕internal∕utils·HasADXandBMI2(SB), $1 | |||
CMPB ·HasADXandBMI2(SB), $1 | |||
JE mul_with_mulx_adcx_adox | |||
CMPB github·com∕cloudflare∕sidh∕internal∕utils·HasBMI2(SB), $1 | |||
CMPB ·HasBMI2(SB), $1 | |||
JE mul_with_mulx | |||
// Generic x86 implementation (below) uses variant of Karatsuba method. | |||
@@ -1194,9 +1194,9 @@ TEXT ·fp503MontgomeryReduce(SB), $0-16 | |||
MOVQ x+8(FP), REG_P1 | |||
// Check wether to use optimized implementation | |||
CMPB github·com∕cloudflare∕sidh∕internal∕utils·HasADXandBMI2(SB), $1 | |||
CMPB ·HasADXandBMI2(SB), $1 | |||
JE redc_with_mulx_adcx_adox | |||
CMPB github·com∕cloudflare∕sidh∕internal∕utils·HasBMI2(SB), $1 | |||
CMPB ·HasBMI2(SB), $1 | |||
JE redc_with_mulx | |||
MOVQ (REG_P1), R11 | |||
@@ -21,21 +21,26 @@ const ( | |||
kUse_MULXandADxX = 1 << 2 | |||
) | |||
func resetCpuFeatures() { | |||
HasBMI2 = cpu.HasBMI2 | |||
HasADXandBMI2 = cpu.HasBMI2 && cpu.HasADX | |||
} | |||
// Utility function used for testing Mul implementations. Tests caller provided | |||
// mulFunc against mul() | |||
func testMul(t *testing.T, f1, f2 OptimFlag) { | |||
doMulTest := func(multiplier, multiplicant FpElement) bool { | |||
defer cpu.RecognizeCpu() | |||
defer resetCpuFeatures() | |||
var resMulRef, resMulOptim FpElementX2 | |||
// Compute multiplier*multiplicant with first implementation | |||
cpu.HasBMI2 = (kUse_MULX & f1) == kUse_MULX | |||
cpu.HasADXandBMI2 = (kUse_MULXandADxX & f1) == kUse_MULXandADxX | |||
HasBMI2 = (kUse_MULX & f1) == kUse_MULX | |||
HasADXandBMI2 = (kUse_MULXandADxX & f1) == kUse_MULXandADxX | |||
fp503Mul(&resMulOptim, &multiplier, &multiplicant) | |||
// Compute multiplier*multiplicant with second implementation | |||
cpu.HasBMI2 = (kUse_MULX & f2) == kUse_MULX | |||
cpu.HasADXandBMI2 = (kUse_MULXandADxX & f2) == kUse_MULXandADxX | |||
HasBMI2 = (kUse_MULX & f2) == kUse_MULX | |||
HasADXandBMI2 = (kUse_MULXandADxX & f2) == kUse_MULXandADxX | |||
fp503Mul(&resMulRef, &multiplier, &multiplicant) | |||
// Compare results | |||
@@ -51,18 +56,18 @@ func testMul(t *testing.T, f1, f2 OptimFlag) { | |||
// redcFunc against redc() | |||
func testRedc(t *testing.T, f1, f2 OptimFlag) { | |||
doRedcTest := func(aRR FpElementX2) bool { | |||
defer cpu.RecognizeCpu() | |||
defer resetCpuFeatures() | |||
var resRedcF1, resRedcF2 FpElement | |||
var aRRcpy = aRR | |||
// Compute redc with first implementation | |||
cpu.HasBMI2 = (kUse_MULX & f1) == kUse_MULX | |||
cpu.HasADXandBMI2 = (kUse_MULXandADxX & f1) == kUse_MULXandADxX | |||
HasBMI2 = (kUse_MULX & f1) == kUse_MULX | |||
HasADXandBMI2 = (kUse_MULXandADxX & f1) == kUse_MULXandADxX | |||
fp503MontgomeryReduce(&resRedcF1, &aRR) | |||
// Compute redc with second implementation | |||
cpu.HasBMI2 = (kUse_MULX & f2) == kUse_MULX | |||
cpu.HasADXandBMI2 = (kUse_MULXandADxX & f2) == kUse_MULXandADxX | |||
HasBMI2 = (kUse_MULX & f2) == kUse_MULX | |||
HasADXandBMI2 = (kUse_MULXandADxX & f2) == kUse_MULXandADxX | |||
fp503MontgomeryReduce(&resRedcF2, &aRRcpy) | |||
// Compare results | |||
@@ -76,8 +81,8 @@ func testRedc(t *testing.T, f1, f2 OptimFlag) { | |||
// Ensures correctness of implementation of mul operation which uses MULX | |||
func TestMulWithMULX(t *testing.T) { | |||
defer cpu.RecognizeCpu() | |||
if !cpu.HasBMI2 { | |||
defer resetCpuFeatures() | |||
if !HasBMI2 { | |||
t.Skip("MULX not supported by the platform") | |||
} | |||
testMul(t, kUse_MULX, kUse_MUL) | |||
@@ -85,8 +90,8 @@ func TestMulWithMULX(t *testing.T) { | |||
// Ensures correctness of implementation of mul operation which uses MULX and ADOX/ADCX | |||
func TestMulWithMULXADxX(t *testing.T) { | |||
defer cpu.RecognizeCpu() | |||
if !cpu.HasADXandBMI2 { | |||
defer resetCpuFeatures() | |||
if !HasADXandBMI2 { | |||
t.Skip("MULX, ADCX and ADOX not supported by the platform") | |||
} | |||
testMul(t, kUse_MULXandADxX, kUse_MUL) | |||
@@ -94,8 +99,8 @@ func TestMulWithMULXADxX(t *testing.T) { | |||
// Ensures correctness of implementation of mul operation which uses MULX and ADOX/ADCX | |||
func TestMulWithMULXADxXAgainstMULX(t *testing.T) { | |||
defer cpu.RecognizeCpu() | |||
if !cpu.HasADXandBMI2 { | |||
defer resetCpuFeatures() | |||
if !HasADXandBMI2 { | |||
t.Skip("MULX, ADCX and ADOX not supported by the platform") | |||
} | |||
testMul(t, kUse_MULX, kUse_MULXandADxX) | |||
@@ -103,8 +108,8 @@ func TestMulWithMULXADxXAgainstMULX(t *testing.T) { | |||
// Ensures correctness of Montgomery reduction implementation which uses MULX | |||
func TestRedcWithMULX(t *testing.T) { | |||
defer cpu.RecognizeCpu() | |||
if !cpu.HasBMI2 { | |||
defer resetCpuFeatures() | |||
if !HasBMI2 { | |||
t.Skip("MULX not supported by the platform") | |||
} | |||
testRedc(t, kUse_MULX, kUse_MUL) | |||
@@ -113,8 +118,8 @@ func TestRedcWithMULX(t *testing.T) { | |||
// Ensures correctness of Montgomery reduction implementation which uses MULX | |||
// and ADCX/ADOX. | |||
func TestRedcWithMULXADxX(t *testing.T) { | |||
defer cpu.RecognizeCpu() | |||
if !cpu.HasADXandBMI2 { | |||
defer resetCpuFeatures() | |||
if !HasADXandBMI2 { | |||
t.Skip("MULX, ADCX and ADOX not supported by the platform") | |||
} | |||
testRedc(t, kUse_MULXandADxX, kUse_MUL) | |||
@@ -123,8 +128,8 @@ func TestRedcWithMULXADxX(t *testing.T) { | |||
// Ensures correctness of Montgomery reduction implementation which uses MULX | |||
// and ADCX/ADOX. | |||
func TestRedcWithMULXADxXAgainstMULX(t *testing.T) { | |||
defer cpu.RecognizeCpu() | |||
if !cpu.HasADXandBMI2 { | |||
defer resetCpuFeatures() | |||
if !HasADXandBMI2 { | |||
t.Skip("MULX, ADCX and ADOX not supported by the platform") | |||
} | |||
testRedc(t, kUse_MULXandADxX, kUse_MULX) | |||
@@ -4,9 +4,6 @@ package p503 | |||
import ( | |||
. "github.com/cloudflare/sidh/internal/isogeny" | |||
// This is imported only because arith_amd64.s needs | |||
// some symbols from cpuid.go | |||
_ "github.com/cloudflare/sidh/internal/utils" | |||
) | |||
// If choice = 0, leave x,y unchanged. If choice = 1, set x,y = y,x. | |||
@@ -0,0 +1,16 @@ | |||
// +build amd64 | |||
package p751 | |||
import cpu "github.com/cloudflare/sidh/internal/utils" | |||
// Signals support for MULX which is in BMI2 | |||
var HasBMI2 bool | |||
// Signals support for ADX and BMI2 | |||
var HasADXandBMI2 bool | |||
func init() { | |||
HasBMI2 = cpu.HasBMI2 | |||
HasADXandBMI2 = cpu.HasBMI2 && cpu.HasADX | |||
} |
@@ -1740,9 +1740,9 @@ TEXT ·fp751MontgomeryReduce(SB), $0-16 | |||
MOVQ x+8(FP), REG_P1 | |||
// Check wether to use optimized implementation | |||
CMPB github·com∕cloudflare∕sidh∕internal∕utils·HasADXandBMI2(SB), $1 | |||
CMPB ·HasADXandBMI2(SB), $1 | |||
JE redc_with_mulx_adcx_adox | |||
CMPB github·com∕cloudflare∕sidh∕internal∕utils·HasBMI2(SB), $1 | |||
CMPB ·HasBMI2(SB), $1 | |||
JE redc_with_mulx | |||
MOVQ (REG_P1), R11 | |||
@@ -22,22 +22,27 @@ const ( | |||
kUse_MULXandADxX = 1 << 2 | |||
) | |||
func resetCpuFeatures() { | |||
HasBMI2 = cpu.HasBMI2 | |||
HasADXandBMI2 = cpu.HasBMI2 && cpu.HasADX | |||
} | |||
// Utility function used for testing REDC implementations. Tests caller provided | |||
// redcFunc against redc() | |||
func testRedc(t *testing.T, f1, f2 OptimFlag) { | |||
doRedcTest := func(aRR FpElementX2) bool { | |||
defer cpu.RecognizeCpu() | |||
defer resetCpuFeatures() | |||
var resRedcF1, resRedcF2 FpElement | |||
var aRRcpy = aRR | |||
// Compute redc with first implementation | |||
cpu.HasBMI2 = (kUse_MULX & f1) == kUse_MULX | |||
cpu.HasADXandBMI2 = (kUse_MULXandADxX & f1) == kUse_MULXandADxX | |||
HasBMI2 = (kUse_MULX & f1) == kUse_MULX | |||
HasADXandBMI2 = (kUse_MULXandADxX & f1) == kUse_MULXandADxX | |||
fp751MontgomeryReduce(&resRedcF1, &aRR) | |||
// Compute redc with second implementation | |||
cpu.HasBMI2 = (kUse_MULX & f2) == kUse_MULX | |||
cpu.HasADXandBMI2 = (kUse_MULXandADxX & f2) == kUse_MULXandADxX | |||
HasBMI2 = (kUse_MULX & f2) == kUse_MULX | |||
HasADXandBMI2 = (kUse_MULXandADxX & f2) == kUse_MULXandADxX | |||
fp751MontgomeryReduce(&resRedcF2, &aRRcpy) | |||
// Compare results | |||
@@ -51,8 +56,8 @@ func testRedc(t *testing.T, f1, f2 OptimFlag) { | |||
// Ensures correctness of Montgomery reduction implementation which uses MULX | |||
func TestRedcWithMULX(t *testing.T) { | |||
defer cpu.RecognizeCpu() | |||
if !cpu.HasBMI2 { | |||
defer resetCpuFeatures() | |||
if !HasBMI2 { | |||
t.Skip("MULX not supported by the platform") | |||
} | |||
testRedc(t, kUse_MULX, kUse_MUL) | |||
@@ -61,8 +66,8 @@ func TestRedcWithMULX(t *testing.T) { | |||
// Ensures correctness of Montgomery reduction implementation which uses MULX | |||
// and ADCX/ADOX. | |||
func TestRedcWithMULXADxX(t *testing.T) { | |||
defer cpu.RecognizeCpu() | |||
if !cpu.HasADXandBMI2 { | |||
defer resetCpuFeatures() | |||
if !HasADXandBMI2 { | |||
t.Skip("MULX, ADCX and ADOX not supported by the platform") | |||
} | |||
testRedc(t, kUse_MULXandADxX, kUse_MUL) | |||
@@ -71,8 +76,8 @@ func TestRedcWithMULXADxX(t *testing.T) { | |||
// Ensures correctness of Montgomery reduction implementation which uses MULX | |||
// and ADCX/ADOX. | |||
func TestRedcWithMULXADxXAgainstMULX(t *testing.T) { | |||
defer cpu.RecognizeCpu() | |||
if !cpu.HasADXandBMI2 { | |||
defer resetCpuFeatures() | |||
if !HasADXandBMI2 { | |||
t.Skip("MULX, ADCX and ADOX not supported by the platform") | |||
} | |||
testRedc(t, kUse_MULXandADxX, kUse_MULX) | |||