Support x86_64 aesenc/aesdec

aes/hash.go

@@ -57,21 +57,21 @@ func HashAes1Rx4(input []byte, output *[64]byte) {
 	for input_ptr := 0; input_ptr < len(input); input_ptr += 64 {
 		in := (*[4][4]uint32)(unsafe.Pointer(unsafe.SliceData(input[input_ptr:])))
 
-		soft_aesenc(&states[0], &in[0])
-		soft_aesdec(&states[1], &in[1])
-		soft_aesenc(&states[2], &in[2])
-		soft_aesdec(&states[3], &in[3])
+		aesenc(&states[0], &in[0])
+		aesdec(&states[1], &in[1])
+		aesenc(&states[2], &in[2])
+		aesdec(&states[3], &in[3])
 	}
 
-	soft_aesenc(&states[0], &keys.AesHash1R_XKeys[0])
-	soft_aesdec(&states[1], &keys.AesHash1R_XKeys[0])
-	soft_aesenc(&states[2], &keys.AesHash1R_XKeys[0])
-	soft_aesdec(&states[3], &keys.AesHash1R_XKeys[0])
+	aesenc(&states[0], &keys.AesHash1R_XKeys[0])
+	aesdec(&states[1], &keys.AesHash1R_XKeys[0])
+	aesenc(&states[2], &keys.AesHash1R_XKeys[0])
+	aesdec(&states[3], &keys.AesHash1R_XKeys[0])
 
-	soft_aesenc(&states[0], &keys.AesHash1R_XKeys[1])
-	soft_aesdec(&states[1], &keys.AesHash1R_XKeys[1])
-	soft_aesenc(&states[2], &keys.AesHash1R_XKeys[1])
-	soft_aesdec(&states[3], &keys.AesHash1R_XKeys[1])
+	aesenc(&states[0], &keys.AesHash1R_XKeys[1])
+	aesdec(&states[1], &keys.AesHash1R_XKeys[1])
+	aesenc(&states[2], &keys.AesHash1R_XKeys[1])
+	aesdec(&states[3], &keys.AesHash1R_XKeys[1])
 
 	copy(output[:], (*[64]byte)(unsafe.Pointer(&states))[:])
 }
@@ -95,10 +95,10 @@ func FillAes1Rx4(state *[64]byte, output []byte) {
 	states := (*[4][4]uint32)(unsafe.Pointer(state))
 
 	for outptr := 0; outptr < len(output); outptr += len(state) {
-		soft_aesdec(&states[0], &keys.AesGenerator1R_Keys[0])
-		soft_aesenc(&states[1], &keys.AesGenerator1R_Keys[1])
-		soft_aesdec(&states[2], &keys.AesGenerator1R_Keys[2])
-		soft_aesenc(&states[3], &keys.AesGenerator1R_Keys[3])
+		aesdec(&states[0], &keys.AesGenerator1R_Keys[0])
+		aesenc(&states[1], &keys.AesGenerator1R_Keys[1])
+		aesdec(&states[2], &keys.AesGenerator1R_Keys[2])
+		aesenc(&states[3], &keys.AesGenerator1R_Keys[3])
 
 		copy(output[outptr:], state[:])
 	}
@@ -116,25 +116,25 @@ func FillAes4Rx4(state [64]byte, output []byte) {
 	states := (*[4][4]uint32)(unsafe.Pointer(&state))
 
 	for outptr := 0; outptr < len(output); outptr += len(state) {
-		soft_aesdec(&states[0], &keys.AesGenerator4R_Keys[0])
-		soft_aesenc(&states[1], &keys.AesGenerator4R_Keys[0])
-		soft_aesdec(&states[2], &keys.AesGenerator4R_Keys[4])
-		soft_aesenc(&states[3], &keys.AesGenerator4R_Keys[4])
+		aesdec(&states[0], &keys.AesGenerator4R_Keys[0])
+		aesenc(&states[1], &keys.AesGenerator4R_Keys[0])
+		aesdec(&states[2], &keys.AesGenerator4R_Keys[4])
+		aesenc(&states[3], &keys.AesGenerator4R_Keys[4])
 
-		soft_aesdec(&states[0], &keys.AesGenerator4R_Keys[1])
-		soft_aesenc(&states[1], &keys.AesGenerator4R_Keys[1])
-		soft_aesdec(&states[2], &keys.AesGenerator4R_Keys[5])
-		soft_aesenc(&states[3], &keys.AesGenerator4R_Keys[5])
+		aesdec(&states[0], &keys.AesGenerator4R_Keys[1])
+		aesenc(&states[1], &keys.AesGenerator4R_Keys[1])
+		aesdec(&states[2], &keys.AesGenerator4R_Keys[5])
+		aesenc(&states[3], &keys.AesGenerator4R_Keys[5])
 
-		soft_aesdec(&states[0], &keys.AesGenerator4R_Keys[2])
-		soft_aesenc(&states[1], &keys.AesGenerator4R_Keys[2])
-		soft_aesdec(&states[2], &keys.AesGenerator4R_Keys[6])
-		soft_aesenc(&states[3], &keys.AesGenerator4R_Keys[6])
+		aesdec(&states[0], &keys.AesGenerator4R_Keys[2])
+		aesenc(&states[1], &keys.AesGenerator4R_Keys[2])
+		aesdec(&states[2], &keys.AesGenerator4R_Keys[6])
+		aesenc(&states[3], &keys.AesGenerator4R_Keys[6])
 
-		soft_aesdec(&states[0], &keys.AesGenerator4R_Keys[3])
-		soft_aesenc(&states[1], &keys.AesGenerator4R_Keys[3])
-		soft_aesdec(&states[2], &keys.AesGenerator4R_Keys[7])
-		soft_aesenc(&states[3], &keys.AesGenerator4R_Keys[7])
+		aesdec(&states[0], &keys.AesGenerator4R_Keys[3])
+		aesenc(&states[1], &keys.AesGenerator4R_Keys[3])
+		aesdec(&states[2], &keys.AesGenerator4R_Keys[7])
+		aesenc(&states[3], &keys.AesGenerator4R_Keys[7])
 
 		copy(output[outptr:], state[:])
 	}

aes/round_amd64.go

@@ -0,0 +1,33 @@
+//go:build amd64 && !purego
+
+package aes
+
+import (
+	_ "git.gammaspectra.live/P2Pool/go-randomx/v2/asm"
+	"golang.org/x/sys/cpu"
+	_ "unsafe"
+)
+
+//go:linkname hard_aesdec git.gammaspectra.live/P2Pool/go-randomx/v2/asm.aesdec
+func hard_aesdec(state *[4]uint32, key *[4]uint32)
+
+//go:linkname hard_aesenc git.gammaspectra.live/P2Pool/go-randomx/v2/asm.aesenc
+func hard_aesenc(state *[4]uint32, key *[4]uint32)
+
+var supportsAES = cpu.X86.HasAES
+
+func aesenc(state *[4]uint32, key *[4]uint32) {
+	if supportsAES {
+		hard_aesenc(state, key)
+	} else {
+		soft_aesenc(state, key)
+	}
+}
+
+func aesdec(state *[4]uint32, key *[4]uint32) {
+	if supportsAES {
+		hard_aesdec(state, key)
+	} else {
+		soft_aesdec(state, key)
+	}
+}