[clang] 8e64821 - [RISCV] Remove unnecessary _32 and _64 suffixes from some scalar crypto builtins.

Craig Topper via cfe-commits cfe-commits at lists.llvm.org
Tue Jul 18 12:56:14 PDT 2023


Author: Craig Topper
Date: 2023-07-18T12:56:01-07:00
New Revision: 8e6482115c242543471efabf7fd82338f76ddd04

URL: https://github.com/llvm/llvm-project/commit/8e6482115c242543471efabf7fd82338f76ddd04
DIFF: https://github.com/llvm/llvm-project/commit/8e6482115c242543471efabf7fd82338f76ddd04.diff

LOG: [RISCV] Remove unnecessary _32 and _64 suffixes from some scalar crypto builtins.

The names of these builtins aren't ambiguous so they don't need the suffix.

Added: 
    

Modified: 
    clang/include/clang/Basic/BuiltinsRISCV.def
    clang/lib/Sema/SemaChecking.cpp
    clang/test/CodeGen/RISCV/rvk-intrinsics/riscv32-zknd.c
    clang/test/CodeGen/RISCV/rvk-intrinsics/riscv32-zkne.c
    clang/test/CodeGen/RISCV/rvk-intrinsics/riscv32-zknh.c
    clang/test/CodeGen/RISCV/rvk-intrinsics/riscv64-zknd-zkne.c
    clang/test/CodeGen/RISCV/rvk-intrinsics/riscv64-zknd.c
    clang/test/CodeGen/RISCV/rvk-intrinsics/riscv64-zkne.c
    clang/test/CodeGen/RISCV/rvk-intrinsics/riscv64-zknh.c
    llvm/include/llvm/IR/IntrinsicsRISCV.td

Removed: 
    


################################################################################
diff  --git a/clang/include/clang/Basic/BuiltinsRISCV.def b/clang/include/clang/Basic/BuiltinsRISCV.def
index 918087b5ad6f71..50e912c2c1c741 100644
--- a/clang/include/clang/Basic/BuiltinsRISCV.def
+++ b/clang/include/clang/Basic/BuiltinsRISCV.def
@@ -44,21 +44,21 @@ TARGET_BUILTIN(__builtin_riscv_zip_32, "UiUi", "nc", "zbkb,32bit")
 TARGET_BUILTIN(__builtin_riscv_unzip_32, "UiUi", "nc", "zbkb,32bit")
 
 // Zknd extension
-TARGET_BUILTIN(__builtin_riscv_aes32dsi_32, "UiUiUiIUi", "nc", "zknd,32bit")
-TARGET_BUILTIN(__builtin_riscv_aes32dsmi_32, "UiUiUiIUi", "nc", "zknd,32bit")
-TARGET_BUILTIN(__builtin_riscv_aes64ds_64, "UWiUWiUWi", "nc", "zknd,64bit")
-TARGET_BUILTIN(__builtin_riscv_aes64dsm_64, "UWiUWiUWi", "nc", "zknd,64bit")
-TARGET_BUILTIN(__builtin_riscv_aes64im_64, "UWiUWi", "nc", "zknd,64bit")
+TARGET_BUILTIN(__builtin_riscv_aes32dsi, "UiUiUiIUi", "nc", "zknd,32bit")
+TARGET_BUILTIN(__builtin_riscv_aes32dsmi, "UiUiUiIUi", "nc", "zknd,32bit")
+TARGET_BUILTIN(__builtin_riscv_aes64ds, "UWiUWiUWi", "nc", "zknd,64bit")
+TARGET_BUILTIN(__builtin_riscv_aes64dsm, "UWiUWiUWi", "nc", "zknd,64bit")
+TARGET_BUILTIN(__builtin_riscv_aes64im, "UWiUWi", "nc", "zknd,64bit")
 
 // Zknd & Zkne
-TARGET_BUILTIN(__builtin_riscv_aes64ks1i_64, "UWiUWiIUi", "nc", "zknd|zkne,64bit")
-TARGET_BUILTIN(__builtin_riscv_aes64ks2_64, "UWiUWiUWi", "nc", "zknd|zkne,64bit")
+TARGET_BUILTIN(__builtin_riscv_aes64ks1i, "UWiUWiIUi", "nc", "zknd|zkne,64bit")
+TARGET_BUILTIN(__builtin_riscv_aes64ks2, "UWiUWiUWi", "nc", "zknd|zkne,64bit")
 
 // Zkne extension
-TARGET_BUILTIN(__builtin_riscv_aes32esi_32, "UiUiUiIUi", "nc", "zkne,32bit")
-TARGET_BUILTIN(__builtin_riscv_aes32esmi_32, "UiUiUiIUi", "nc", "zkne,32bit")
-TARGET_BUILTIN(__builtin_riscv_aes64es_64, "UWiUWiUWi", "nc", "zkne,64bit")
-TARGET_BUILTIN(__builtin_riscv_aes64esm_64, "UWiUWiUWi", "nc", "zkne,64bit")
+TARGET_BUILTIN(__builtin_riscv_aes32esi, "UiUiUiIUi", "nc", "zkne,32bit")
+TARGET_BUILTIN(__builtin_riscv_aes32esmi, "UiUiUiIUi", "nc", "zkne,32bit")
+TARGET_BUILTIN(__builtin_riscv_aes64es, "UWiUWiUWi", "nc", "zkne,64bit")
+TARGET_BUILTIN(__builtin_riscv_aes64esm, "UWiUWiUWi", "nc", "zkne,64bit")
 
 // Zknh extension
 TARGET_BUILTIN(__builtin_riscv_sha256sig0, "UiUi", "nc", "zknh")
@@ -66,16 +66,16 @@ TARGET_BUILTIN(__builtin_riscv_sha256sig1, "UiUi", "nc", "zknh")
 TARGET_BUILTIN(__builtin_riscv_sha256sum0, "UiUi", "nc", "zknh")
 TARGET_BUILTIN(__builtin_riscv_sha256sum1, "UiUi", "nc", "zknh")
 
-TARGET_BUILTIN(__builtin_riscv_sha512sig0h_32, "UiUiUi", "nc", "zknh,32bit")
-TARGET_BUILTIN(__builtin_riscv_sha512sig0l_32, "UiUiUi", "nc", "zknh,32bit")
-TARGET_BUILTIN(__builtin_riscv_sha512sig1h_32, "UiUiUi", "nc", "zknh,32bit")
-TARGET_BUILTIN(__builtin_riscv_sha512sig1l_32, "UiUiUi", "nc", "zknh,32bit")
-TARGET_BUILTIN(__builtin_riscv_sha512sum0r_32, "UiUiUi", "nc", "zknh,32bit")
-TARGET_BUILTIN(__builtin_riscv_sha512sum1r_32, "UiUiUi", "nc", "zknh,32bit")
-TARGET_BUILTIN(__builtin_riscv_sha512sig0_64, "UWiUWi", "nc", "zknh,64bit")
-TARGET_BUILTIN(__builtin_riscv_sha512sig1_64, "UWiUWi", "nc", "zknh,64bit")
-TARGET_BUILTIN(__builtin_riscv_sha512sum0_64, "UWiUWi", "nc", "zknh,64bit")
-TARGET_BUILTIN(__builtin_riscv_sha512sum1_64, "UWiUWi", "nc", "zknh,64bit")
+TARGET_BUILTIN(__builtin_riscv_sha512sig0h, "UiUiUi", "nc", "zknh,32bit")
+TARGET_BUILTIN(__builtin_riscv_sha512sig0l, "UiUiUi", "nc", "zknh,32bit")
+TARGET_BUILTIN(__builtin_riscv_sha512sig1h, "UiUiUi", "nc", "zknh,32bit")
+TARGET_BUILTIN(__builtin_riscv_sha512sig1l, "UiUiUi", "nc", "zknh,32bit")
+TARGET_BUILTIN(__builtin_riscv_sha512sum0r, "UiUiUi", "nc", "zknh,32bit")
+TARGET_BUILTIN(__builtin_riscv_sha512sum1r, "UiUiUi", "nc", "zknh,32bit")
+TARGET_BUILTIN(__builtin_riscv_sha512sig0, "UWiUWi", "nc", "zknh,64bit")
+TARGET_BUILTIN(__builtin_riscv_sha512sig1, "UWiUWi", "nc", "zknh,64bit")
+TARGET_BUILTIN(__builtin_riscv_sha512sum0, "UWiUWi", "nc", "zknh,64bit")
+TARGET_BUILTIN(__builtin_riscv_sha512sum1, "UWiUWi", "nc", "zknh,64bit")
 
 // Zksed extension
 TARGET_BUILTIN(__builtin_riscv_sm4ed, "UiUiUiIUi", "nc", "zksed")

diff  --git a/clang/lib/Sema/SemaChecking.cpp b/clang/lib/Sema/SemaChecking.cpp
index b09d0383b4bd9a..339f15ba1217fb 100644
--- a/clang/lib/Sema/SemaChecking.cpp
+++ b/clang/lib/Sema/SemaChecking.cpp
@@ -4686,15 +4686,15 @@ bool Sema::CheckRISCVBuiltinFunctionCall(const TargetInfo &TI,
     // bit_26, vs2, fs1
     return SemaBuiltinConstantArgRange(TheCall, 0, 0, 1);
   // Check if byteselect is in [0, 3]
-  case RISCV::BI__builtin_riscv_aes32dsi_32:
-  case RISCV::BI__builtin_riscv_aes32dsmi_32:
-  case RISCV::BI__builtin_riscv_aes32esi_32:
-  case RISCV::BI__builtin_riscv_aes32esmi_32:
+  case RISCV::BI__builtin_riscv_aes32dsi:
+  case RISCV::BI__builtin_riscv_aes32dsmi:
+  case RISCV::BI__builtin_riscv_aes32esi:
+  case RISCV::BI__builtin_riscv_aes32esmi:
   case RISCV::BI__builtin_riscv_sm4ks:
   case RISCV::BI__builtin_riscv_sm4ed:
     return SemaBuiltinConstantArgRange(TheCall, 2, 0, 3);
   // Check if rnum is in [0, 10]
-  case RISCV::BI__builtin_riscv_aes64ks1i_64:
+  case RISCV::BI__builtin_riscv_aes64ks1i:
     return SemaBuiltinConstantArgRange(TheCall, 1, 0, 10);
   // Check if value range for vxrm is in [0, 3]
   case RISCVVector::BI__builtin_rvv_vaaddu_vv:

diff  --git a/clang/test/CodeGen/RISCV/rvk-intrinsics/riscv32-zknd.c b/clang/test/CodeGen/RISCV/rvk-intrinsics/riscv32-zknd.c
index cf24f1bd3dc218..f9472d4c36fb3b 100644
--- a/clang/test/CodeGen/RISCV/rvk-intrinsics/riscv32-zknd.c
+++ b/clang/test/CodeGen/RISCV/rvk-intrinsics/riscv32-zknd.c
@@ -16,7 +16,7 @@
 // RV32ZKND-NEXT:    ret i32 [[TMP2]]
 //
 uint32_t aes32dsi(uint32_t rs1, uint32_t rs2) {
-  return __builtin_riscv_aes32dsi_32(rs1, rs2, 3);
+  return __builtin_riscv_aes32dsi(rs1, rs2, 3);
 }
 
 // RV32ZKND-LABEL: @aes32dsmi(
@@ -31,5 +31,5 @@ uint32_t aes32dsi(uint32_t rs1, uint32_t rs2) {
 // RV32ZKND-NEXT:    ret i32 [[TMP2]]
 //
 uint32_t aes32dsmi(uint32_t rs1, uint32_t rs2) {
-  return __builtin_riscv_aes32dsmi_32(rs1, rs2, 3);
+  return __builtin_riscv_aes32dsmi(rs1, rs2, 3);
 }

diff  --git a/clang/test/CodeGen/RISCV/rvk-intrinsics/riscv32-zkne.c b/clang/test/CodeGen/RISCV/rvk-intrinsics/riscv32-zkne.c
index 5b61b9b0ea52a1..7243c3f3e2cb1e 100644
--- a/clang/test/CodeGen/RISCV/rvk-intrinsics/riscv32-zkne.c
+++ b/clang/test/CodeGen/RISCV/rvk-intrinsics/riscv32-zkne.c
@@ -16,7 +16,7 @@
 // RV32ZKNE-NEXT:    ret i32 [[TMP2]]
 //
 uint32_t aes32esi(uint32_t rs1, uint32_t rs2) {
-  return __builtin_riscv_aes32esi_32(rs1, rs2, 3);
+  return __builtin_riscv_aes32esi(rs1, rs2, 3);
 }
 
 // RV32ZKNE-LABEL: @aes32esmi(
@@ -31,5 +31,5 @@ uint32_t aes32esi(uint32_t rs1, uint32_t rs2) {
 // RV32ZKNE-NEXT:    ret i32 [[TMP2]]
 //
 uint32_t aes32esmi(uint32_t rs1, uint32_t rs2) {
-  return __builtin_riscv_aes32esmi_32(rs1, rs2, 3);
+  return __builtin_riscv_aes32esmi(rs1, rs2, 3);
 }

diff  --git a/clang/test/CodeGen/RISCV/rvk-intrinsics/riscv32-zknh.c b/clang/test/CodeGen/RISCV/rvk-intrinsics/riscv32-zknh.c
index d374ac4b6c3dd2..3cc429c175d3dd 100644
--- a/clang/test/CodeGen/RISCV/rvk-intrinsics/riscv32-zknh.c
+++ b/clang/test/CodeGen/RISCV/rvk-intrinsics/riscv32-zknh.c
@@ -64,7 +64,7 @@ uint32_t sha256sum1(uint32_t rs1) {
 // RV32ZKNH-NEXT:    ret i32 [[TMP2]]
 //
 uint32_t sha512sig0h(uint32_t rs1, uint32_t rs2) {
-  return __builtin_riscv_sha512sig0h_32(rs1, rs2);
+  return __builtin_riscv_sha512sig0h(rs1, rs2);
 }
 
 // RV32ZKNH-LABEL: @sha512sig0l(
@@ -79,7 +79,7 @@ uint32_t sha512sig0h(uint32_t rs1, uint32_t rs2) {
 // RV32ZKNH-NEXT:    ret i32 [[TMP2]]
 //
 uint32_t sha512sig0l(uint32_t rs1, uint32_t rs2) {
-  return __builtin_riscv_sha512sig0l_32(rs1, rs2);
+  return __builtin_riscv_sha512sig0l(rs1, rs2);
 }
 
 // RV32ZKNH-LABEL: @sha512sig1h(
@@ -94,7 +94,7 @@ uint32_t sha512sig0l(uint32_t rs1, uint32_t rs2) {
 // RV32ZKNH-NEXT:    ret i32 [[TMP2]]
 //
 uint32_t sha512sig1h(uint32_t rs1, uint32_t rs2) {
-  return __builtin_riscv_sha512sig1h_32(rs1, rs2);
+  return __builtin_riscv_sha512sig1h(rs1, rs2);
 }
 
 // RV32ZKNH-LABEL: @sha512sig1l(
@@ -109,7 +109,7 @@ uint32_t sha512sig1h(uint32_t rs1, uint32_t rs2) {
 // RV32ZKNH-NEXT:    ret i32 [[TMP2]]
 //
 uint32_t sha512sig1l(uint32_t rs1, uint32_t rs2) {
-  return __builtin_riscv_sha512sig1l_32(rs1, rs2);
+  return __builtin_riscv_sha512sig1l(rs1, rs2);
 }
 
 // RV32ZKNH-LABEL: @sha512sum0r(
@@ -124,7 +124,7 @@ uint32_t sha512sig1l(uint32_t rs1, uint32_t rs2) {
 // RV32ZKNH-NEXT:    ret i32 [[TMP2]]
 //
 uint32_t sha512sum0r(uint32_t rs1, uint32_t rs2) {
-  return __builtin_riscv_sha512sum0r_32(rs1, rs2);
+  return __builtin_riscv_sha512sum0r(rs1, rs2);
 }
 
 // RV32ZKNH-LABEL: @sha512sum1r(
@@ -139,5 +139,5 @@ uint32_t sha512sum0r(uint32_t rs1, uint32_t rs2) {
 // RV32ZKNH-NEXT:    ret i32 [[TMP2]]
 //
 uint32_t sha512sum1r(uint32_t rs1, uint32_t rs2) {
-  return __builtin_riscv_sha512sum1r_32(rs1, rs2);
+  return __builtin_riscv_sha512sum1r(rs1, rs2);
 }

diff  --git a/clang/test/CodeGen/RISCV/rvk-intrinsics/riscv64-zknd-zkne.c b/clang/test/CodeGen/RISCV/rvk-intrinsics/riscv64-zknd-zkne.c
index 0d2aac2f8fb682..e51c85c578d1ab 100644
--- a/clang/test/CodeGen/RISCV/rvk-intrinsics/riscv64-zknd-zkne.c
+++ b/clang/test/CodeGen/RISCV/rvk-intrinsics/riscv64-zknd-zkne.c
@@ -15,7 +15,7 @@
 // RV64ZKND-ZKNE-NEXT:    ret i64 [[TMP1]]
 //
 uint64_t aes64ks1i(uint64_t rs1) {
-  return __builtin_riscv_aes64ks1i_64(rs1, 0);
+  return __builtin_riscv_aes64ks1i(rs1, 0);
 }
 
 // RV64ZKND-ZKNE-LABEL: @aes64ks2(
@@ -30,5 +30,5 @@ uint64_t aes64ks1i(uint64_t rs1) {
 // RV64ZKND-ZKNE-NEXT:    ret i64 [[TMP2]]
 //
 uint64_t aes64ks2(uint64_t rs1, uint64_t rs2) {
-  return __builtin_riscv_aes64ks2_64(rs1, rs2);
+  return __builtin_riscv_aes64ks2(rs1, rs2);
 }

diff  --git a/clang/test/CodeGen/RISCV/rvk-intrinsics/riscv64-zknd.c b/clang/test/CodeGen/RISCV/rvk-intrinsics/riscv64-zknd.c
index 98490ec726e97b..33375f0d483cff 100644
--- a/clang/test/CodeGen/RISCV/rvk-intrinsics/riscv64-zknd.c
+++ b/clang/test/CodeGen/RISCV/rvk-intrinsics/riscv64-zknd.c
@@ -16,7 +16,7 @@
 // RV64ZKND-NEXT:    ret i64 [[TMP2]]
 //
 uint64_t aes64dsm(uint64_t rs1, uint64_t rs2) {
-  return __builtin_riscv_aes64dsm_64(rs1, rs2);
+  return __builtin_riscv_aes64dsm(rs1, rs2);
 }
 
 
@@ -32,7 +32,7 @@ uint64_t aes64dsm(uint64_t rs1, uint64_t rs2) {
 // RV64ZKND-NEXT:    ret i64 [[TMP2]]
 //
 uint64_t aes64ds(uint64_t rs1, uint64_t rs2) {
-  return __builtin_riscv_aes64ds_64(rs1, rs2);
+  return __builtin_riscv_aes64ds(rs1, rs2);
 }
 
 
@@ -45,5 +45,5 @@ uint64_t aes64ds(uint64_t rs1, uint64_t rs2) {
 // RV64ZKND-NEXT:    ret i64 [[TMP1]]
 //
 uint64_t aes64im(uint64_t rs1) {
-  return __builtin_riscv_aes64im_64(rs1);
+  return __builtin_riscv_aes64im(rs1);
 }

diff  --git a/clang/test/CodeGen/RISCV/rvk-intrinsics/riscv64-zkne.c b/clang/test/CodeGen/RISCV/rvk-intrinsics/riscv64-zkne.c
index c605a2af5f4f36..bd0c301339ad3c 100644
--- a/clang/test/CodeGen/RISCV/rvk-intrinsics/riscv64-zkne.c
+++ b/clang/test/CodeGen/RISCV/rvk-intrinsics/riscv64-zkne.c
@@ -16,7 +16,7 @@
 // RV64ZKNE-NEXT:    ret i64 [[TMP2]]
 //
 uint64_t aes64es(uint64_t rs1, uint64_t rs2) {
-  return __builtin_riscv_aes64es_64(rs1, rs2);
+  return __builtin_riscv_aes64es(rs1, rs2);
 }
 
 
@@ -32,5 +32,5 @@ uint64_t aes64es(uint64_t rs1, uint64_t rs2) {
 // RV64ZKNE-NEXT:    ret i64 [[TMP2]]
 //
 uint64_t aes64esm(uint64_t rs1, uint64_t rs2) {
-  return __builtin_riscv_aes64esm_64(rs1, rs2);
+  return __builtin_riscv_aes64esm(rs1, rs2);
 }

diff  --git a/clang/test/CodeGen/RISCV/rvk-intrinsics/riscv64-zknh.c b/clang/test/CodeGen/RISCV/rvk-intrinsics/riscv64-zknh.c
index 82ff73b01d713b..fc54e627de3cae 100644
--- a/clang/test/CodeGen/RISCV/rvk-intrinsics/riscv64-zknh.c
+++ b/clang/test/CodeGen/RISCV/rvk-intrinsics/riscv64-zknh.c
@@ -13,7 +13,7 @@
 // RV64ZKNH-NEXT:    ret i64 [[TMP1]]
 //
 uint64_t sha512sig0(uint64_t rs1) {
-  return __builtin_riscv_sha512sig0_64(rs1);
+  return __builtin_riscv_sha512sig0(rs1);
 }
 
 
@@ -26,7 +26,7 @@ uint64_t sha512sig0(uint64_t rs1) {
 // RV64ZKNH-NEXT:    ret i64 [[TMP1]]
 //
 uint64_t sha512sig1(uint64_t rs1) {
-  return __builtin_riscv_sha512sig1_64(rs1);
+  return __builtin_riscv_sha512sig1(rs1);
 }
 
 
@@ -39,7 +39,7 @@ uint64_t sha512sig1(uint64_t rs1) {
 // RV64ZKNH-NEXT:    ret i64 [[TMP1]]
 //
 uint64_t sha512sum0(uint64_t rs1) {
-  return __builtin_riscv_sha512sum0_64(rs1);
+  return __builtin_riscv_sha512sum0(rs1);
 }
 
 
@@ -52,7 +52,7 @@ uint64_t sha512sum0(uint64_t rs1) {
 // RV64ZKNH-NEXT:    ret i64 [[TMP1]]
 //
 uint64_t sha512sum1(uint64_t rs1) {
-  return __builtin_riscv_sha512sum1_64(rs1);
+  return __builtin_riscv_sha512sum1(rs1);
 }
 
 

diff  --git a/llvm/include/llvm/IR/IntrinsicsRISCV.td b/llvm/include/llvm/IR/IntrinsicsRISCV.td
index 2c00bcf5c7dfd9..e3476b160db68b 100644
--- a/llvm/include/llvm/IR/IntrinsicsRISCV.td
+++ b/llvm/include/llvm/IR/IntrinsicsRISCV.td
@@ -1767,37 +1767,37 @@ class ScalarCryptoGprIntrinsic64
 
 // Zknd
 def int_riscv_aes32dsi  : ScalarCryptoByteSelect32,
-                          ClangBuiltin<"__builtin_riscv_aes32dsi_32">;
+                          ClangBuiltin<"__builtin_riscv_aes32dsi">;
 def int_riscv_aes32dsmi : ScalarCryptoByteSelect32,
-                          ClangBuiltin<"__builtin_riscv_aes32dsmi_32">;
+                          ClangBuiltin<"__builtin_riscv_aes32dsmi">;
 
 def int_riscv_aes64ds   : ScalarCryptoGprGprIntrinsic64,
-                          ClangBuiltin<"__builtin_riscv_aes64ds_64">;
+                          ClangBuiltin<"__builtin_riscv_aes64ds">;
 def int_riscv_aes64dsm  : ScalarCryptoGprGprIntrinsic64,
-                          ClangBuiltin<"__builtin_riscv_aes64dsm_64">;
+                          ClangBuiltin<"__builtin_riscv_aes64dsm">;
 
 def int_riscv_aes64im   : ScalarCryptoGprIntrinsic64,
-                          ClangBuiltin<"__builtin_riscv_aes64im_64">;
+                          ClangBuiltin<"__builtin_riscv_aes64im">;
 
 // Zkne
 def int_riscv_aes32esi  : ScalarCryptoByteSelect32,
-                          ClangBuiltin<"__builtin_riscv_aes32esi_32">;
+                          ClangBuiltin<"__builtin_riscv_aes32esi">;
 def int_riscv_aes32esmi : ScalarCryptoByteSelect32,
-                          ClangBuiltin<"__builtin_riscv_aes32esmi_32">;
+                          ClangBuiltin<"__builtin_riscv_aes32esmi">;
 
 def int_riscv_aes64es   : ScalarCryptoGprGprIntrinsic64,
-                          ClangBuiltin<"__builtin_riscv_aes64es_64">;
+                          ClangBuiltin<"__builtin_riscv_aes64es">;
 def int_riscv_aes64esm  : ScalarCryptoGprGprIntrinsic64,
-                          ClangBuiltin<"__builtin_riscv_aes64esm_64">;
+                          ClangBuiltin<"__builtin_riscv_aes64esm">;
 
 // Zknd & Zkne
 def int_riscv_aes64ks2  : ScalarCryptoGprGprIntrinsic64,
-                          ClangBuiltin<"__builtin_riscv_aes64ks2_64">;
+                          ClangBuiltin<"__builtin_riscv_aes64ks2">;
 def int_riscv_aes64ks1i : DefaultAttrsIntrinsic<[llvm_i64_ty],
                                                 [llvm_i64_ty, llvm_i32_ty],
                                                 [IntrNoMem, IntrSpeculatable,
                                                  ImmArg<ArgIndex<1>>]>,
-                          ClangBuiltin<"__builtin_riscv_aes64ks1i_64">;
+                          ClangBuiltin<"__builtin_riscv_aes64ks1i">;
 
 // Zknh
 def int_riscv_sha256sig0 : ScalarCryptoGprIntrinsic32;
@@ -1806,26 +1806,26 @@ def int_riscv_sha256sum0 : ScalarCryptoGprIntrinsic32;
 def int_riscv_sha256sum1 : ScalarCryptoGprIntrinsic32;
 
 def int_riscv_sha512sig0l : ScalarCryptoGprGprIntrinsic32,
-                            ClangBuiltin<"__builtin_riscv_sha512sig0l_32">;
+                            ClangBuiltin<"__builtin_riscv_sha512sig0l">;
 def int_riscv_sha512sig0h : ScalarCryptoGprGprIntrinsic32,
-                            ClangBuiltin<"__builtin_riscv_sha512sig0h_32">;
+                            ClangBuiltin<"__builtin_riscv_sha512sig0h">;
 def int_riscv_sha512sig1l : ScalarCryptoGprGprIntrinsic32,
-                            ClangBuiltin<"__builtin_riscv_sha512sig1l_32">;
+                            ClangBuiltin<"__builtin_riscv_sha512sig1l">;
 def int_riscv_sha512sig1h : ScalarCryptoGprGprIntrinsic32,
-                            ClangBuiltin<"__builtin_riscv_sha512sig1h_32">;
+                            ClangBuiltin<"__builtin_riscv_sha512sig1h">;
 def int_riscv_sha512sum0r : ScalarCryptoGprGprIntrinsic32,
-                            ClangBuiltin<"__builtin_riscv_sha512sum0r_32">;
+                            ClangBuiltin<"__builtin_riscv_sha512sum0r">;
 def int_riscv_sha512sum1r : ScalarCryptoGprGprIntrinsic32,
-                            ClangBuiltin<"__builtin_riscv_sha512sum1r_32">;
+                            ClangBuiltin<"__builtin_riscv_sha512sum1r">;
 
 def int_riscv_sha512sig0 : ScalarCryptoGprIntrinsic64,
-                           ClangBuiltin<"__builtin_riscv_sha512sig0_64">;
+                           ClangBuiltin<"__builtin_riscv_sha512sig0">;
 def int_riscv_sha512sig1 : ScalarCryptoGprIntrinsic64,
-                           ClangBuiltin<"__builtin_riscv_sha512sig1_64">;
+                           ClangBuiltin<"__builtin_riscv_sha512sig1">;
 def int_riscv_sha512sum0 : ScalarCryptoGprIntrinsic64,
-                           ClangBuiltin<"__builtin_riscv_sha512sum0_64">;
+                           ClangBuiltin<"__builtin_riscv_sha512sum0">;
 def int_riscv_sha512sum1 : ScalarCryptoGprIntrinsic64,
-                           ClangBuiltin<"__builtin_riscv_sha512sum1_64">;
+                           ClangBuiltin<"__builtin_riscv_sha512sum1">;
 
 // Zksed
 def int_riscv_sm4ks      : ScalarCryptoByteSelect32;


        


More information about the cfe-commits mailing list