Github_Repos/cvw
1
0
Fork 1
mirror of https://github.com/openhwgroup/cvw synced 2025-02-11 06:05:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

AES64 simplification

Browse Source
This commit is contained in:
David Harris 2024-03-11 01:01:20 -07:00
parent 7d87c4f6c5
commit 64d7f778da
3 changed files with 15 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ieu/bmu/bitmanipalu.sv
View File

@ -117,8 +117,10 @@ module bitmanipalu import cvw::*; #(parameter cvw_t P) (
if (P.ZKND_SUPPORTED) aes32d aes32d(.bs(Funct7[6:5]), .rs1(ABMU), .rs2(BBMU), .finalround(ZBBSelect[2]), .result(ZKNDResult)); if (P.ZKND_SUPPORTED) aes32d aes32d(.bs(Funct7[6:5]), .rs1(ABMU), .rs2(BBMU), .finalround(ZBBSelect[2]), .result(ZKNDResult));
if (P.ZKNE_SUPPORTED) aes32e aes32e(.bs(Funct7[6:5]), .rs1(ABMU), .rs2(BBMU), .finalround(ZBBSelect[2]), .result(ZKNEResult)); if (P.ZKNE_SUPPORTED) aes32e aes32e(.bs(Funct7[6:5]), .rs1(ABMU), .rs2(BBMU), .finalround(ZBBSelect[2]), .result(ZKNEResult));
end else end else
if (P.ZKND_SUPPORTED | P.ZKNE_SUPPORTED) if (P.ZKND_SUPPORTED | P.ZKNE_SUPPORTED) begin
zkn64 #(P) ZKND64(.A(ABMU), .B(BBMU), .Funct7, .round(Rs2E[3:0]), .ZKNSelect(ZBBSelect[3:0]), .ZKNDResult, .ZKNEResult); // *** simplify to only one output zkn64 #(P) ZKN64(.A(ABMU), .B(BBMU), .Funct7, .round(Rs2E[3:0]), .ZKNSelect(ZBBSelect[3:0]), .ZKNResult(ZKNDResult));
assign ZKNEResult = ZKNDResult;
end
/* /*
// ZKND Unit // ZKND Unit

8
src/ieu/bmu/bmuctrl.sv
View File

@ -235,16 +235,16 @@ module bmuctrl import cvw::*; #(parameter cvw_t P) (
endcase endcase
else if (P.XLEN==64) else if (P.XLEN==64)
casez({OpD, Funct7D, Funct3D}) casez({OpD, Funct7D, Funct3D})
17'b0110011_0011001_000: BMUControlsD = `BMUCTRLW'b000_1000_0100_1_0_0_1_0_0_0_0_0; // aes64es - encrypt final round 17'b0110011_0011001_000: BMUControlsD = `BMUCTRLW'b000_1000_0101_1_0_0_1_0_0_0_0_0; // aes64es - encrypt final round
17'b0110011_0011011_000: BMUControlsD = `BMUCTRLW'b000_1000_0000_1_0_0_1_0_0_0_0_0; // aes64esm - encrypt mid round 17'b0110011_0011011_000: BMUControlsD = `BMUCTRLW'b000_1000_0001_1_0_0_1_0_0_0_0_0; // aes64esm - encrypt mid round
endcase endcase
end end
if ((P.ZKND_SUPPORTED | P.ZKNE_SUPPORTED) & P.XLEN == 64) begin // ZKND and ZKNE shared instructions if ((P.ZKND_SUPPORTED | P.ZKNE_SUPPORTED) & P.XLEN == 64) begin // ZKND and ZKNE shared instructions
casez({OpD, Funct7D, Funct3D}) casez({OpD, Funct7D, Funct3D})
17'b0010011_0011000_001: if (Rs2D[4] == 1'b1) 17'b0010011_0011000_001: if (Rs2D[4] == 1'b1)
BMUControlsD = `BMUCTRLW'b000_0111_0001_1_0_0_1_0_0_0_0_0; // aes64ks1i - key schedule istr1 ... Don't know why this works here only ... P.XLEN is not 64 bits? BMUControlsD = `BMUCTRLW'b000_0111_0010_1_0_0_1_0_0_0_0_0; // aes64ks1i - key schedule istr1
17'b0110011_0111111_000: BMUControlsD = `BMUCTRLW'b000_0111_0010_1_0_0_1_0_0_0_0_0; // aes64ks2 - key schedule istr2 17'b0110011_0111111_000: BMUControlsD = `BMUCTRLW'b000_0111_0011_1_0_0_1_0_0_0_0_0; // aes64ks2 - key schedule istr2
endcase endcase
end end

30
src/ieu/kmu/zkn64.sv
View File

@ -28,17 +28,13 @@
module zkn64 import cvw::*; #(parameter cvw_t P) ( module zkn64 import cvw::*; #(parameter cvw_t P) (
input logic [63:0] A, B, input logic [63:0] A, B,
input logic [6:0] Funct7, input logic [6:0] Funct7,
input logic [3:0] round, input logic [3:0] round,
input logic [3:0] ZKNSelect, input logic [3:0] ZKNSelect,
output logic [63:0] ZKNDResult, ZKNEResult output logic [63:0] ZKNResult
); );
// zknd64 #(64) ZKND64(.A, .B, .Funct7, .round, .ZKNDSelect(ZKNSelect[3:0]), .ZKNDResult); // *** strip out parameter unneded logic [63:0] aes64dRes, aes64eRes, aes64ks1iRes, aes64ks2Res;
// zkne64 #(64) ZKNE64(.A, .B, .Funct7, .round, .ZKNESelect(ZKNSelect[2:0]), .ZKNEResult);
logic [63:0] aes64dRes, aes64eRes, aes64imRes, aes64ks1iRes, aes64ks2Res;
if (P.ZKND_SUPPORTED) // ZKND supports aes64ds, aes64dsm, aes64im if (P.ZKND_SUPPORTED) // ZKND supports aes64ds, aes64dsm, aes64im
aes64d aes64d(.rs1(A), .rs2(B), .finalround(ZKNSelect[2]), .aes64im(ZKNSelect[3]), .result(aes64dRes)); // decode AES aes64d aes64d(.rs1(A), .rs2(B), .finalround(ZKNSelect[2]), .aes64im(ZKNSelect[3]), .result(aes64dRes)); // decode AES
@ -49,18 +45,6 @@ module zkn64 import cvw::*; #(parameter cvw_t P) (
aes64ks1i aes64ks1i(.round, .rs1(A), .result(aes64ks1iRes)); aes64ks1i aes64ks1i(.round, .rs1(A), .result(aes64ks1iRes));
aes64ks2 aes64ks2(.rs2(B), .rs1(A), .result(aes64ks2Res)); aes64ks2 aes64ks2(.rs2(B), .rs1(A), .result(aes64ks2Res));
mux3 #(64) zkndmux(aes64dRes, aes64ks1iRes, aes64ks2Res, ZKNSelect[1:0], ZKNDResult); // Choose among decrypt, encrypt, key schedule 1, key schedule 2 results
mux3 #(64) zknemux(aes64eRes, aes64ks1iRes, aes64ks2Res, ZKNSelect[1:0], ZKNEResult); mux4 #(64) zkndmux(aes64dRes, aes64eRes, aes64ks1iRes, aes64ks2Res, ZKNSelect[1:0], ZKNResult);
/*
logic [63:0] aes64eRes, aes64ks1iRes, aes64ks2Res;
// RV64
aes64ks1i aes64ks1i(.round, .rs1(A), .result(aes64ks1iRes));
aes64ks2 aes64ks2(.rs2(B), .rs1(A), .result(aes64ks2Res));
// 010 is a placeholder to match the select of ZKND's AES64KS1I since they share some instruction
mux4 #(WIDTH) zknemux(aes64eRes, aes64dRes, aes64ks1iRes, aes64ks2Res, ZKNESelect[1:0], ZKNEResult);
*/
endmodule endmodule