fix runtime architecture decision flag

arithmetic_decl.go

@@ -9,10 +9,13 @@ import (
 var mul func(c, a, b *fe) = mulADX
 var mulAssign func(a, b *fe) = mulAssignADX
 
-func setup() {
-	if !(cpu.X86.HasADX && cpu.X86.HasBMI2) || forceNonADXArch {
-		mul = mulNoADX
-		mulAssign = mulAssignNoADX
+func cfgArch() {
+	if !x86ArchitectureSet {
+		if !(cpu.X86.HasADX && cpu.X86.HasBMI2) || forceNonADXArch {
+			mul = mulNoADX
+			mulAssign = mulAssignNoADX
+		}
+		x86ArchitectureSet = true
 	}
 }
 

bls12_381.go

@@ -252,3 +252,10 @@ var frobeniusCoeffs12 = [12]fe2{
 */
 
 var x, _ = new(big.Int).SetString("d201000000010000", 16)
+
+/*
+	Non bls related
+*/
+
+var forceNonADXArch bool
+var x86ArchitectureSet bool = false

bls12_381_test.go

@@ -9,15 +9,14 @@ import (
 )
 
 var fuz int
-var forceNonADXArch bool
 
 func TestMain(m *testing.M) {
 	_fuz := flag.Int("fuzz", 10, "# of iterations")
 	adx := flag.Bool("noadx", false, "to enfoce non adx arch")
 	flag.Parse()
 	forceNonADXArch = *adx
 	fuz = *_fuz
-	setup()
+	cfgArch()
 	m.Run()
 }
 

g1.go

@@ -23,6 +23,7 @@ type G1 struct {
 }
 
 func NewG1() *G1 {
+	cfgArch()
 	t := newTempG1()
 	return &G1{t}
 }

g2.go

@@ -27,6 +27,7 @@ type G2 struct {
 }
 
 func NewG2(f *fp2) *G2 {
+	cfgArch()
 	if f == nil {
 		f = newFp2()
 	}

pairing.go

@@ -19,6 +19,7 @@ type Engine struct {
 }
 
 func NewEngine() *Engine {
+	cfgArch()
 	fp2 := newFp2()
 	fp6 := newFp6(fp2)
 	fp12 := newFp12(fp6)