craig.topper updated this revision to Diff 542121.
craig.topper added a comment.
Rebase after using mem2reg.
Fix a couple copy/paste mistakes that were much easier to spot with mem2reg.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D155647/new/
https://reviews.llvm.org/D155647
Files:
clang/lib/Headers/CMakeLists.txt
clang/lib/Headers/riscv_crypto.h
clang/test/CodeGen/RISCV/rvb-intrinsics/riscv32-zbkb.c
clang/test/CodeGen/RISCV/rvb-intrinsics/riscv32-zbkc.c
clang/test/CodeGen/RISCV/rvb-intrinsics/riscv32-zbkx.c
clang/test/CodeGen/RISCV/rvb-intrinsics/riscv64-zbkb.c
clang/test/CodeGen/RISCV/rvb-intrinsics/riscv64-zbkc.c
clang/test/CodeGen/RISCV/rvb-intrinsics/riscv64-zbkx.c
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
clang/test/CodeGen/RISCV/rvk-intrinsics/zksed.c
clang/test/CodeGen/RISCV/rvk-intrinsics/zksh.c
Index: clang/test/CodeGen/RISCV/rvk-intrinsics/zksh.c
===================================================================
--- clang/test/CodeGen/RISCV/rvk-intrinsics/zksh.c
+++ clang/test/CodeGen/RISCV/rvk-intrinsics/zksh.c
@@ -6,7 +6,7 @@
// RUN: -disable-O0-optnone | opt -S -passes=mem2reg \
// RUN: | FileCheck %s -check-prefix=RV64ZKSH
-#include <stdint.h>
+#include <riscv_crypto.h>
// RV32ZKSH-LABEL: @sm3p0(
// RV32ZKSH-NEXT: entry:
@@ -19,7 +19,7 @@
// RV64ZKSH-NEXT: ret i32 [[TMP0]]
//
uint32_t sm3p0(uint32_t rs1) {
- return __builtin_riscv_sm3p0(rs1);
+ return __riscv_sm3p0(rs1);
}
@@ -34,5 +34,5 @@
// RV64ZKSH-NEXT: ret i32 [[TMP0]]
//
uint32_t sm3p1(uint32_t rs1) {
- return __builtin_riscv_sm3p1(rs1);
+ return __riscv_sm3p1(rs1);
}
Index: clang/test/CodeGen/RISCV/rvk-intrinsics/zksed.c
===================================================================
--- clang/test/CodeGen/RISCV/rvk-intrinsics/zksed.c
+++ clang/test/CodeGen/RISCV/rvk-intrinsics/zksed.c
@@ -6,7 +6,7 @@
// RUN: -disable-O0-optnone | opt -S -passes=mem2reg \
// RUN: | FileCheck %s -check-prefix=RV64ZKSED
-#include <stdint.h>
+#include <riscv_crypto.h>
// RV32ZKSED-LABEL: @sm4ks(
// RV32ZKSED-NEXT: entry:
@@ -19,7 +19,7 @@
// RV64ZKSED-NEXT: ret i32 [[TMP0]]
//
uint32_t sm4ks(uint32_t rs1, uint32_t rs2) {
- return __builtin_riscv_sm4ks(rs1, rs2, 0);
+ return __riscv_sm4ks(rs1, rs2, 0);
}
// RV32ZKSED-LABEL: @sm4ed(
@@ -33,5 +33,5 @@
// RV64ZKSED-NEXT: ret i32 [[TMP0]]
//
uint32_t sm4ed(uint32_t rs1, uint32_t rs2) {
- return __builtin_riscv_sm4ed(rs1, rs2, 0);
+ return __riscv_sm4ed(rs1, rs2, 0);
}
Index: clang/test/CodeGen/RISCV/rvk-intrinsics/riscv64-zknh.c
===================================================================
--- clang/test/CodeGen/RISCV/rvk-intrinsics/riscv64-zknh.c
+++ clang/test/CodeGen/RISCV/rvk-intrinsics/riscv64-zknh.c
@@ -3,7 +3,7 @@
// RUN: -disable-O0-optnone | opt -S -passes=mem2reg \
// RUN: | FileCheck %s -check-prefix=RV64ZKNH
-#include <stdint.h>
+#include <riscv_crypto.h>
// RV64ZKNH-LABEL: @sha512sig0(
// RV64ZKNH-NEXT: entry:
@@ -11,7 +11,7 @@
// RV64ZKNH-NEXT: ret i64 [[TMP0]]
//
uint64_t sha512sig0(uint64_t rs1) {
- return __builtin_riscv_sha512sig0(rs1);
+ return __riscv_sha512sig0(rs1);
}
@@ -21,7 +21,7 @@
// RV64ZKNH-NEXT: ret i64 [[TMP0]]
//
uint64_t sha512sig1(uint64_t rs1) {
- return __builtin_riscv_sha512sig1(rs1);
+ return __riscv_sha512sig1(rs1);
}
@@ -31,7 +31,7 @@
// RV64ZKNH-NEXT: ret i64 [[TMP0]]
//
uint64_t sha512sum0(uint64_t rs1) {
- return __builtin_riscv_sha512sum0(rs1);
+ return __riscv_sha512sum0(rs1);
}
@@ -41,7 +41,7 @@
// RV64ZKNH-NEXT: ret i64 [[TMP0]]
//
uint64_t sha512sum1(uint64_t rs1) {
- return __builtin_riscv_sha512sum1(rs1);
+ return __riscv_sha512sum1(rs1);
}
@@ -51,7 +51,7 @@
// RV64ZKNH-NEXT: ret i32 [[TMP0]]
//
uint32_t sha256sig0(uint32_t rs1) {
- return __builtin_riscv_sha256sig0(rs1);
+ return __riscv_sha256sig0(rs1);
}
// RV64ZKNH-LABEL: @sha256sig1(
@@ -60,7 +60,7 @@
// RV64ZKNH-NEXT: ret i32 [[TMP0]]
//
uint32_t sha256sig1(uint32_t rs1) {
- return __builtin_riscv_sha256sig1(rs1);
+ return __riscv_sha256sig1(rs1);
}
@@ -70,7 +70,7 @@
// RV64ZKNH-NEXT: ret i32 [[TMP0]]
//
uint32_t sha256sum0(uint32_t rs1) {
- return __builtin_riscv_sha256sum0(rs1);
+ return __riscv_sha256sum0(rs1);
}
// RV64ZKNH-LABEL: @sha256sum1(
@@ -79,5 +79,5 @@
// RV64ZKNH-NEXT: ret i32 [[TMP0]]
//
uint32_t sha256sum1(uint32_t rs1) {
- return __builtin_riscv_sha256sum1(rs1);
+ return __riscv_sha256sum1(rs1);
}
Index: clang/test/CodeGen/RISCV/rvk-intrinsics/riscv64-zkne.c
===================================================================
--- clang/test/CodeGen/RISCV/rvk-intrinsics/riscv64-zkne.c
+++ clang/test/CodeGen/RISCV/rvk-intrinsics/riscv64-zkne.c
@@ -3,7 +3,7 @@
// RUN: -disable-O0-optnone | opt -S -passes=mem2reg \
// RUN: | FileCheck %s -check-prefix=RV64ZKNE
-#include <stdint.h>
+#include <riscv_crypto.h>
// RV64ZKNE-LABEL: @aes64es(
// RV64ZKNE-NEXT: entry:
@@ -11,7 +11,7 @@
// RV64ZKNE-NEXT: ret i64 [[TMP0]]
//
uint64_t aes64es(uint64_t rs1, uint64_t rs2) {
- return __builtin_riscv_aes64es(rs1, rs2);
+ return __riscv_aes64es(rs1, rs2);
}
@@ -21,5 +21,5 @@
// RV64ZKNE-NEXT: ret i64 [[TMP0]]
//
uint64_t aes64esm(uint64_t rs1, uint64_t rs2) {
- return __builtin_riscv_aes64esm(rs1, rs2);
+ return __riscv_aes64esm(rs1, rs2);
}
Index: clang/test/CodeGen/RISCV/rvk-intrinsics/riscv64-zknd.c
===================================================================
--- clang/test/CodeGen/RISCV/rvk-intrinsics/riscv64-zknd.c
+++ clang/test/CodeGen/RISCV/rvk-intrinsics/riscv64-zknd.c
@@ -3,7 +3,7 @@
// RUN: -disable-O0-optnone | opt -S -passes=mem2reg \
// RUN: | FileCheck %s -check-prefix=RV64ZKND
-#include <stdint.h>
+#include <riscv_crypto.h>
// RV64ZKND-LABEL: @aes64dsm(
// RV64ZKND-NEXT: entry:
@@ -11,7 +11,7 @@
// RV64ZKND-NEXT: ret i64 [[TMP0]]
//
uint64_t aes64dsm(uint64_t rs1, uint64_t rs2) {
- return __builtin_riscv_aes64dsm(rs1, rs2);
+ return __riscv_aes64dsm(rs1, rs2);
}
@@ -21,7 +21,7 @@
// RV64ZKND-NEXT: ret i64 [[TMP0]]
//
uint64_t aes64ds(uint64_t rs1, uint64_t rs2) {
- return __builtin_riscv_aes64ds(rs1, rs2);
+ return __riscv_aes64ds(rs1, rs2);
}
@@ -31,5 +31,5 @@
// RV64ZKND-NEXT: ret i64 [[TMP0]]
//
uint64_t aes64im(uint64_t rs1) {
- return __builtin_riscv_aes64im(rs1);
+ return __riscv_aes64im(rs1);
}
Index: clang/test/CodeGen/RISCV/rvk-intrinsics/riscv64-zknd-zkne.c
===================================================================
--- clang/test/CodeGen/RISCV/rvk-intrinsics/riscv64-zknd-zkne.c
+++ clang/test/CodeGen/RISCV/rvk-intrinsics/riscv64-zknd-zkne.c
@@ -6,7 +6,7 @@
// RUN: -disable-O0-optnone | opt -S -passes=mem2reg \
// RUN: | FileCheck %s -check-prefix=RV64ZKND-ZKNE
-#include <stdint.h>
+#include <riscv_crypto.h>
// RV64ZKND-ZKNE-LABEL: @aes64ks1i(
// RV64ZKND-ZKNE-NEXT: entry:
@@ -14,7 +14,7 @@
// RV64ZKND-ZKNE-NEXT: ret i64 [[TMP0]]
//
uint64_t aes64ks1i(uint64_t rs1) {
- return __builtin_riscv_aes64ks1i(rs1, 0);
+ return __riscv_aes64ks1i(rs1, 0);
}
// RV64ZKND-ZKNE-LABEL: @aes64ks2(
@@ -23,5 +23,5 @@
// RV64ZKND-ZKNE-NEXT: ret i64 [[TMP0]]
//
uint64_t aes64ks2(uint64_t rs1, uint64_t rs2) {
- return __builtin_riscv_aes64ks2(rs1, rs2);
+ return __riscv_aes64ks2(rs1, rs2);
}
Index: clang/test/CodeGen/RISCV/rvk-intrinsics/riscv32-zknh.c
===================================================================
--- clang/test/CodeGen/RISCV/rvk-intrinsics/riscv32-zknh.c
+++ clang/test/CodeGen/RISCV/rvk-intrinsics/riscv32-zknh.c
@@ -3,7 +3,7 @@
// RUN: -disable-O0-optnone | opt -S -passes=mem2reg \
// RUN: | FileCheck %s -check-prefix=RV32ZKNH
-#include <stdint.h>
+#include <riscv_crypto.h>
// RV32ZKNH-LABEL: @sha256sig0(
// RV32ZKNH-NEXT: entry:
@@ -11,7 +11,7 @@
// RV32ZKNH-NEXT: ret i32 [[TMP0]]
//
uint32_t sha256sig0(uint32_t rs1) {
- return __builtin_riscv_sha256sig0(rs1);
+ return __riscv_sha256sig0(rs1);
}
// RV32ZKNH-LABEL: @sha256sig1(
@@ -20,7 +20,7 @@
// RV32ZKNH-NEXT: ret i32 [[TMP0]]
//
uint32_t sha256sig1(uint32_t rs1) {
- return __builtin_riscv_sha256sig1(rs1);
+ return __riscv_sha256sig1(rs1);
}
// RV32ZKNH-LABEL: @sha256sum0(
@@ -29,7 +29,7 @@
// RV32ZKNH-NEXT: ret i32 [[TMP0]]
//
uint32_t sha256sum0(uint32_t rs1) {
- return __builtin_riscv_sha256sum0(rs1);
+ return __riscv_sha256sum0(rs1);
}
// RV32ZKNH-LABEL: @sha256sum1(
@@ -38,7 +38,7 @@
// RV32ZKNH-NEXT: ret i32 [[TMP0]]
//
uint32_t sha256sum1(uint32_t rs1) {
- return __builtin_riscv_sha256sum1(rs1);
+ return __riscv_sha256sum1(rs1);
}
// RV32ZKNH-LABEL: @sha512sig0h(
@@ -47,7 +47,7 @@
// RV32ZKNH-NEXT: ret i32 [[TMP0]]
//
uint32_t sha512sig0h(uint32_t rs1, uint32_t rs2) {
- return __builtin_riscv_sha512sig0h(rs1, rs2);
+ return __riscv_sha512sig0h(rs1, rs2);
}
// RV32ZKNH-LABEL: @sha512sig0l(
@@ -56,7 +56,7 @@
// RV32ZKNH-NEXT: ret i32 [[TMP0]]
//
uint32_t sha512sig0l(uint32_t rs1, uint32_t rs2) {
- return __builtin_riscv_sha512sig0l(rs1, rs2);
+ return __riscv_sha512sig0l(rs1, rs2);
}
// RV32ZKNH-LABEL: @sha512sig1h(
@@ -65,7 +65,7 @@
// RV32ZKNH-NEXT: ret i32 [[TMP0]]
//
uint32_t sha512sig1h(uint32_t rs1, uint32_t rs2) {
- return __builtin_riscv_sha512sig1h(rs1, rs2);
+ return __riscv_sha512sig1h(rs1, rs2);
}
// RV32ZKNH-LABEL: @sha512sig1l(
@@ -74,7 +74,7 @@
// RV32ZKNH-NEXT: ret i32 [[TMP0]]
//
uint32_t sha512sig1l(uint32_t rs1, uint32_t rs2) {
- return __builtin_riscv_sha512sig1l(rs1, rs2);
+ return __riscv_sha512sig1l(rs1, rs2);
}
// RV32ZKNH-LABEL: @sha512sum0r(
@@ -83,7 +83,7 @@
// RV32ZKNH-NEXT: ret i32 [[TMP0]]
//
uint32_t sha512sum0r(uint32_t rs1, uint32_t rs2) {
- return __builtin_riscv_sha512sum0r(rs1, rs2);
+ return __riscv_sha512sum0r(rs1, rs2);
}
// RV32ZKNH-LABEL: @sha512sum1r(
@@ -92,5 +92,5 @@
// RV32ZKNH-NEXT: ret i32 [[TMP0]]
//
uint32_t sha512sum1r(uint32_t rs1, uint32_t rs2) {
- return __builtin_riscv_sha512sum1r(rs1, rs2);
+ return __riscv_sha512sum1r(rs1, rs2);
}
Index: clang/test/CodeGen/RISCV/rvk-intrinsics/riscv32-zkne.c
===================================================================
--- clang/test/CodeGen/RISCV/rvk-intrinsics/riscv32-zkne.c
+++ clang/test/CodeGen/RISCV/rvk-intrinsics/riscv32-zkne.c
@@ -3,7 +3,7 @@
// RUN: -disable-O0-optnone | opt -S -passes=mem2reg \
// RUN: | FileCheck %s -check-prefix=RV32ZKNE
-#include <stdint.h>
+#include <riscv_crypto.h>
// RV32ZKNE-LABEL: @aes32esi(
// RV32ZKNE-NEXT: entry:
@@ -11,7 +11,7 @@
// RV32ZKNE-NEXT: ret i32 [[TMP0]]
//
uint32_t aes32esi(uint32_t rs1, uint32_t rs2) {
- return __builtin_riscv_aes32esi(rs1, rs2, 3);
+ return __riscv_aes32esi(rs1, rs2, 3);
}
// RV32ZKNE-LABEL: @aes32esmi(
@@ -20,5 +20,5 @@
// RV32ZKNE-NEXT: ret i32 [[TMP0]]
//
uint32_t aes32esmi(uint32_t rs1, uint32_t rs2) {
- return __builtin_riscv_aes32esmi(rs1, rs2, 3);
+ return __riscv_aes32esmi(rs1, rs2, 3);
}
Index: clang/test/CodeGen/RISCV/rvk-intrinsics/riscv32-zknd.c
===================================================================
--- clang/test/CodeGen/RISCV/rvk-intrinsics/riscv32-zknd.c
+++ clang/test/CodeGen/RISCV/rvk-intrinsics/riscv32-zknd.c
@@ -3,7 +3,7 @@
// RUN: -disable-O0-optnone | opt -S -passes=mem2reg \
// RUN: | FileCheck %s -check-prefix=RV32ZKND
-#include <stdint.h>
+#include <riscv_crypto.h>
// RV32ZKND-LABEL: @aes32dsi(
// RV32ZKND-NEXT: entry:
@@ -11,7 +11,7 @@
// RV32ZKND-NEXT: ret i32 [[TMP0]]
//
uint32_t aes32dsi(uint32_t rs1, uint32_t rs2) {
- return __builtin_riscv_aes32dsi(rs1, rs2, 3);
+ return __riscv_aes32dsi(rs1, rs2, 3);
}
// RV32ZKND-LABEL: @aes32dsmi(
@@ -20,5 +20,5 @@
// RV32ZKND-NEXT: ret i32 [[TMP0]]
//
uint32_t aes32dsmi(uint32_t rs1, uint32_t rs2) {
- return __builtin_riscv_aes32dsmi(rs1, rs2, 3);
+ return __riscv_aes32dsmi(rs1, rs2, 3);
}
Index: clang/test/CodeGen/RISCV/rvb-intrinsics/riscv64-zbkx.c
===================================================================
--- clang/test/CodeGen/RISCV/rvb-intrinsics/riscv64-zbkx.c
+++ clang/test/CodeGen/RISCV/rvb-intrinsics/riscv64-zbkx.c
@@ -3,7 +3,7 @@
// RUN: -disable-O0-optnone | opt -S -passes=mem2reg \
// RUN: | FileCheck %s -check-prefix=RV64ZBKX
-#include <stdint.h>
+#include <riscv_crypto.h>
// RV64ZBKX-LABEL: @xperm8(
// RV64ZBKX-NEXT: entry:
@@ -12,7 +12,7 @@
//
uint64_t xperm8(uint64_t rs1, uint64_t rs2)
{
- return __builtin_riscv_xperm8_64(rs1, rs2);
+ return __riscv_xperm8_64(rs1, rs2);
}
// RV64ZBKX-LABEL: @xperm4(
@@ -22,5 +22,5 @@
//
uint64_t xperm4(uint64_t rs1, uint64_t rs2)
{
- return __builtin_riscv_xperm4_64(rs1, rs2);
+ return __riscv_xperm4_64(rs1, rs2);
}
Index: clang/test/CodeGen/RISCV/rvb-intrinsics/riscv64-zbkc.c
===================================================================
--- clang/test/CodeGen/RISCV/rvb-intrinsics/riscv64-zbkc.c
+++ clang/test/CodeGen/RISCV/rvb-intrinsics/riscv64-zbkc.c
@@ -3,7 +3,7 @@
// RUN: -disable-O0-optnone | opt -S -passes=mem2reg \
// RUN: | FileCheck %s -check-prefix=RV64ZBKC
-#include <stdint.h>
+#include <riscv_crypto.h>
// RV64ZBKC-LABEL: @clmul_64(
// RV64ZBKC-NEXT: entry:
@@ -11,7 +11,7 @@
// RV64ZBKC-NEXT: ret i64 [[TMP0]]
//
uint64_t clmul_64(uint64_t a, uint64_t b) {
- return __builtin_riscv_clmul_64(a, b);
+ return __riscv_clmul_64(a, b);
}
// RV64ZBKC-LABEL: @clmulh_64(
@@ -20,7 +20,7 @@
// RV64ZBKC-NEXT: ret i64 [[TMP0]]
//
uint64_t clmulh_64(uint64_t a, uint64_t b) {
- return __builtin_riscv_clmulh_64(a, b);
+ return __riscv_clmulh_64(a, b);
}
// RV64ZBKC-LABEL: @clmul_32(
@@ -29,5 +29,5 @@
// RV64ZBKC-NEXT: ret i32 [[TMP0]]
//
uint32_t clmul_32(uint32_t a, uint32_t b) {
- return __builtin_riscv_clmul_32(a, b);
+ return __riscv_clmul_32(a, b);
}
Index: clang/test/CodeGen/RISCV/rvb-intrinsics/riscv64-zbkb.c
===================================================================
--- clang/test/CodeGen/RISCV/rvb-intrinsics/riscv64-zbkb.c
+++ clang/test/CodeGen/RISCV/rvb-intrinsics/riscv64-zbkb.c
@@ -3,7 +3,7 @@
// RUN: -disable-O0-optnone | opt -S -passes=mem2reg \
// RUN: | FileCheck %s -check-prefix=RV64ZBKB
-#include <stdint.h>
+#include <riscv_crypto.h>
// RV64ZBKB-LABEL: @brev8_32(
// RV64ZBKB-NEXT: entry:
@@ -12,7 +12,7 @@
//
uint32_t brev8_32(uint32_t rs1)
{
- return __builtin_riscv_brev8_32(rs1);
+ return __riscv_brev8_32(rs1);
}
// RV64ZBKB-LABEL: @brev8_64(
@@ -22,5 +22,67 @@
//
uint64_t brev8_64(uint64_t rs1)
{
- return __builtin_riscv_brev8_64(rs1);
+ return __riscv_brev8_64(rs1);
+}
+
+// RV64ZBKB-LABEL: @rev8_32(
+// RV64ZBKB-NEXT: entry:
+// RV64ZBKB-NEXT: [[TMP0:%.*]] = call i32 @llvm.bswap.i32(i32 [[RS1:%.*]])
+// RV64ZBKB-NEXT: ret i32 [[TMP0]]
+//
+uint32_t rev8_32(uint32_t rs1)
+{
+ return __riscv_rev8_32(rs1);
+}
+
+// RV64ZBKB-LABEL: @rev8_64(
+// RV64ZBKB-NEXT: entry:
+// RV64ZBKB-NEXT: [[TMP0:%.*]] = call i64 @llvm.bswap.i64(i64 [[RS1:%.*]])
+// RV64ZBKB-NEXT: ret i64 [[TMP0]]
+//
+uint64_t rev8_64(uint64_t rs1)
+{
+ return __riscv_rev8_64(rs1);
+}
+
+// RV64ZBKB-LABEL: @rol_32(
+// RV64ZBKB-NEXT: entry:
+// RV64ZBKB-NEXT: [[TMP0:%.*]] = call i32 @llvm.fshl.i32(i32 [[RS1:%.*]], i32 [[RS1]], i32 [[RS2:%.*]])
+// RV64ZBKB-NEXT: ret i32 [[TMP0]]
+//
+uint32_t rol_32(uint32_t rs1, uint32_t rs2)
+{
+ return __riscv_rol_32(rs1, rs2);
+}
+
+// RV64ZBKB-LABEL: @rol_64(
+// RV64ZBKB-NEXT: entry:
+// RV64ZBKB-NEXT: [[CONV_I:%.*]] = zext i32 [[RS2:%.*]] to i64
+// RV64ZBKB-NEXT: [[TMP0:%.*]] = call i64 @llvm.fshl.i64(i64 [[RS1:%.*]], i64 [[RS1]], i64 [[CONV_I]])
+// RV64ZBKB-NEXT: ret i64 [[TMP0]]
+//
+uint64_t rol_64(uint64_t rs1, uint32_t rs2)
+{
+ return __riscv_rol_64(rs1, rs2);
+}
+
+// RV64ZBKB-LABEL: @ror_32(
+// RV64ZBKB-NEXT: entry:
+// RV64ZBKB-NEXT: [[TMP0:%.*]] = call i32 @llvm.fshr.i32(i32 [[RS1:%.*]], i32 [[RS1]], i32 [[RS2:%.*]])
+// RV64ZBKB-NEXT: ret i32 [[TMP0]]
+//
+uint32_t ror_32(uint32_t rs1, uint32_t rs2)
+{
+ return __riscv_ror_32(rs1, rs2);
+}
+
+// RV64ZBKB-LABEL: @ror_64(
+// RV64ZBKB-NEXT: entry:
+// RV64ZBKB-NEXT: [[CONV_I:%.*]] = zext i32 [[RS2:%.*]] to i64
+// RV64ZBKB-NEXT: [[TMP0:%.*]] = call i64 @llvm.fshr.i64(i64 [[RS1:%.*]], i64 [[RS1]], i64 [[CONV_I]])
+// RV64ZBKB-NEXT: ret i64 [[TMP0]]
+//
+uint64_t ror_64(uint64_t rs1, uint32_t rs2)
+{
+ return __riscv_ror_64(rs1, rs2);
}
Index: clang/test/CodeGen/RISCV/rvb-intrinsics/riscv32-zbkx.c
===================================================================
--- clang/test/CodeGen/RISCV/rvb-intrinsics/riscv32-zbkx.c
+++ clang/test/CodeGen/RISCV/rvb-intrinsics/riscv32-zbkx.c
@@ -3,7 +3,7 @@
// RUN: -disable-O0-optnone | opt -S -passes=mem2reg \
// RUN: | FileCheck %s -check-prefix=RV32ZBKX
-#include <stdint.h>
+#include <riscv_crypto.h>
// RV32ZBKX-LABEL: @xperm8(
// RV32ZBKX-NEXT: entry:
@@ -12,7 +12,7 @@
//
uint32_t xperm8(uint32_t rs1, uint32_t rs2)
{
- return __builtin_riscv_xperm8_32(rs1, rs2);
+ return __riscv_xperm8_32(rs1, rs2);
}
// RV32ZBKX-LABEL: @xperm4(
@@ -22,5 +22,5 @@
//
uint32_t xperm4(uint32_t rs1, uint32_t rs2)
{
- return __builtin_riscv_xperm4_32(rs1, rs2);
+ return __riscv_xperm4_32(rs1, rs2);
}
Index: clang/test/CodeGen/RISCV/rvb-intrinsics/riscv32-zbkc.c
===================================================================
--- clang/test/CodeGen/RISCV/rvb-intrinsics/riscv32-zbkc.c
+++ clang/test/CodeGen/RISCV/rvb-intrinsics/riscv32-zbkc.c
@@ -3,7 +3,7 @@
// RUN: -disable-O0-optnone | opt -S -passes=mem2reg \
// RUN: | FileCheck %s -check-prefix=RV32ZBKC
-#include <stdint.h>
+#include <riscv_crypto.h>
// RV32ZBKC-LABEL: @clmul_32(
// RV32ZBKC-NEXT: entry:
@@ -11,7 +11,7 @@
// RV32ZBKC-NEXT: ret i32 [[TMP0]]
//
uint32_t clmul_32(uint32_t a, uint32_t b) {
- return __builtin_riscv_clmul_32(a, b);
+ return __riscv_clmul_32(a, b);
}
// RV32ZBKC-LABEL: @clmulh_32(
@@ -20,5 +20,5 @@
// RV32ZBKC-NEXT: ret i32 [[TMP0]]
//
uint32_t clmulh_32(uint32_t a, uint32_t b) {
- return __builtin_riscv_clmulh_32(a, b);
+ return __riscv_clmulh_32(a, b);
}
Index: clang/test/CodeGen/RISCV/rvb-intrinsics/riscv32-zbkb.c
===================================================================
--- clang/test/CodeGen/RISCV/rvb-intrinsics/riscv32-zbkb.c
+++ clang/test/CodeGen/RISCV/rvb-intrinsics/riscv32-zbkb.c
@@ -3,7 +3,7 @@
// RUN: -disable-O0-optnone | opt -S -passes=mem2reg \
// RUN: | FileCheck %s -check-prefix=RV32ZBKB
-#include <stdint.h>
+#include <riscv_crypto.h>
// RV32ZBKB-LABEL: @brev8(
// RV32ZBKB-NEXT: entry:
@@ -12,7 +12,7 @@
//
uint32_t brev8(uint32_t rs1)
{
- return __builtin_riscv_brev8_32(rs1);
+ return __riscv_brev8_32(rs1);
}
// RV32ZBKB-LABEL: @zip(
@@ -22,7 +22,7 @@
//
uint32_t zip(uint32_t rs1)
{
- return __builtin_riscv_zip_32(rs1);
+ return __riscv_zip_32(rs1);
}
// RV32ZBKB-LABEL: @unzip(
@@ -32,5 +32,35 @@
//
uint32_t unzip(uint32_t rs1)
{
- return __builtin_riscv_unzip_32(rs1);
+ return __riscv_unzip_32(rs1);
+}
+
+// RV32ZBKB-LABEL: @rev8(
+// RV32ZBKB-NEXT: entry:
+// RV32ZBKB-NEXT: [[TMP0:%.*]] = call i32 @llvm.bswap.i32(i32 [[RS1:%.*]])
+// RV32ZBKB-NEXT: ret i32 [[TMP0]]
+//
+uint32_t rev8(uint32_t rs1)
+{
+ return __riscv_rev8_32(rs1);
+}
+
+// RV32ZBKB-LABEL: @rol(
+// RV32ZBKB-NEXT: entry:
+// RV32ZBKB-NEXT: [[TMP0:%.*]] = call i32 @llvm.fshl.i32(i32 [[RS1:%.*]], i32 [[RS1]], i32 [[RS2:%.*]])
+// RV32ZBKB-NEXT: ret i32 [[TMP0]]
+//
+uint32_t rol(uint32_t rs1, uint32_t rs2)
+{
+ return __riscv_rol_32(rs1, rs2);
+}
+
+// RV32ZBKB-LABEL: @ror(
+// RV32ZBKB-NEXT: entry:
+// RV32ZBKB-NEXT: [[TMP0:%.*]] = call i32 @llvm.fshr.i32(i32 [[RS1:%.*]], i32 [[RS1]], i32 [[RS2:%.*]])
+// RV32ZBKB-NEXT: ret i32 [[TMP0]]
+//
+uint32_t ror(uint32_t rs1, uint32_t rs2)
+{
+ return __riscv_ror_32(rs1, rs2);
}
Index: clang/lib/Headers/riscv_crypto.h
===================================================================
--- /dev/null
+++ clang/lib/Headers/riscv_crypto.h
@@ -0,0 +1,288 @@
+/*===---- riscv_crypto.h - RISC-V Zk* and Zbk* intrinsics ------------------===
+ *
+ * Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+ * See https://llvm.org/LICENSE.txt for license information.
+ * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+ *
+ *===-----------------------------------------------------------------------===
+ */
+
+#ifndef __RISCV_CRYPTO_H
+#define __RISCV_CRYPTO_H
+
+#include <stdint.h>
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+#if defined(__riscv_zbkb)
+static __inline__ uint32_t __attribute__((__always_inline__, __nodebug__))
+__riscv_brev8_32(uint32_t __x) {
+ return __builtin_riscv_brev8_32(__x);
+}
+
+static __inline__ uint32_t __attribute__((__always_inline__, __nodebug__))
+__riscv_rev8_32(uint32_t __x) {
+ return __builtin_bswap32(__x);
+}
+
+static __inline__ uint32_t __attribute__((__always_inline__, __nodebug__))
+__riscv_rol_32(uint32_t __x, uint32_t __y) {
+ return __builtin_rotateleft32(__x, __y);
+}
+
+static __inline__ uint32_t __attribute__((__always_inline__, __nodebug__))
+__riscv_ror_32(uint32_t __x, uint32_t __y) {
+ return __builtin_rotateright32(__x, __y);
+}
+
+#if __riscv_xlen == 64
+static __inline__ uint64_t __attribute__((__always_inline__, __nodebug__))
+__riscv_brev8_64(uint64_t __x) {
+ return __builtin_riscv_brev8_64(__x);
+}
+
+static __inline__ uint64_t __attribute__((__always_inline__, __nodebug__))
+__riscv_rev8_64(uint64_t __x) {
+ return __builtin_bswap64(__x);
+}
+
+static __inline__ uint64_t __attribute__((__always_inline__, __nodebug__))
+__riscv_rol_64(uint64_t __x, uint32_t __y) {
+ return __builtin_rotateleft64(__x, __y);
+}
+
+static __inline__ uint64_t __attribute__((__always_inline__, __nodebug__))
+__riscv_ror_64(uint64_t __x, uint32_t __y) {
+ return __builtin_rotateright64(__x, __y);
+}
+#endif
+
+#if __riscv_xlen == 32
+static __inline__ uint32_t __attribute__((__always_inline__, __nodebug__))
+__riscv_unzip_32(uint32_t __x) {
+ return __builtin_riscv_unzip_32(__x);
+}
+
+static __inline__ uint32_t __attribute__((__always_inline__, __nodebug__))
+__riscv_zip_32(uint32_t __x) {
+ return __builtin_riscv_zip_32(__x);
+}
+#endif
+#endif // defined(__riscv_zbkb)
+
+#if defined(__riscv_zbkc)
+static __inline__ uint32_t __attribute__((__always_inline__, __nodebug__))
+__riscv_clmul_32(uint32_t __x, uint32_t __y) {
+ return __builtin_riscv_clmul_32(__x, __y);
+}
+
+#if __riscv_xlen == 32
+static __inline__ uint32_t __attribute__((__always_inline__, __nodebug__))
+__riscv_clmulh_32(uint32_t __x, uint32_t __y) {
+ return __builtin_riscv_clmulh_32(__x, __y);
+}
+#endif
+
+#if __riscv_xlen == 64
+static __inline__ uint64_t __attribute__((__always_inline__, __nodebug__))
+__riscv_clmul_64(uint64_t __x, uint64_t __y) {
+ return __builtin_riscv_clmul_64(__x, __y);
+}
+
+static __inline__ uint64_t __attribute__((__always_inline__, __nodebug__))
+__riscv_clmulh_64(uint64_t __x, uint64_t __y) {
+ return __builtin_riscv_clmulh_64(__x, __y);
+}
+#endif
+#endif // defined(__riscv_zbkc)
+
+#if defined(__riscv_zbkx)
+#if __riscv_xlen == 32
+static __inline__ uint32_t __attribute__((__always_inline__, __nodebug__))
+__riscv_xperm4_32(uint32_t __x, uint32_t __y) {
+ return __builtin_riscv_xperm4_32(__x, __y);
+}
+
+static __inline__ uint32_t __attribute__((__always_inline__, __nodebug__))
+__riscv_xperm8_32(uint32_t __x, uint32_t __y) {
+ return __builtin_riscv_xperm8_32(__x, __y);
+}
+#endif
+
+#if __riscv_xlen == 64
+static __inline__ uint64_t __attribute__((__always_inline__, __nodebug__))
+__riscv_xperm4_64(uint64_t __x, uint64_t __y) {
+ return __builtin_riscv_xperm4_64(__x, __y);
+}
+
+static __inline__ uint64_t __attribute__((__always_inline__, __nodebug__))
+__riscv_xperm8_64(uint64_t __x, uint64_t __y) {
+ return __builtin_riscv_xperm8_64(__x, __y);
+}
+#endif
+#endif // defined(__riscv_zbkx)
+
+#if defined(__riscv_zknd)
+#if __riscv_xlen == 32
+#define __riscv_aes32dsi(x, y, bs) __builtin_riscv_aes32dsi(x, y, bs)
+#define __riscv_aes32dsmi(x, y, bs) __builtin_riscv_aes32dsmi(x, y, bs)
+#endif
+
+#if __riscv_xlen == 64
+static __inline__ uint64_t __attribute__((__always_inline__, __nodebug__))
+__riscv_aes64ds(uint64_t __x, uint64_t __y) {
+ return __builtin_riscv_aes64ds(__x, __y);
+}
+
+static __inline__ uint64_t __attribute__((__always_inline__, __nodebug__))
+__riscv_aes64dsm(uint64_t __x, uint64_t __y) {
+ return __builtin_riscv_aes64dsm(__x, __y);
+}
+
+static __inline__ uint64_t __attribute__((__always_inline__, __nodebug__))
+__riscv_aes64im(uint64_t __x) {
+ return __builtin_riscv_aes64im(__x);
+}
+#endif
+#endif // defined(__riscv_zknd)
+
+#if defined(__riscv_zkne)
+#if __riscv_xlen == 32
+#define __riscv_aes32esi(x, y, bs) __builtin_riscv_aes32esi(x, y, bs)
+#define __riscv_aes32esmi(x, y, bs) __builtin_riscv_aes32esmi(x, y, bs)
+#endif
+
+#if __riscv_xlen == 64
+static __inline__ uint64_t __attribute__((__always_inline__, __nodebug__))
+__riscv_aes64es(uint64_t __x, uint64_t __y) {
+ return __builtin_riscv_aes64es(__x, __y);
+}
+
+static __inline__ uint64_t __attribute__((__always_inline__, __nodebug__))
+__riscv_aes64esm(uint64_t __x, uint64_t __y) {
+ return __builtin_riscv_aes64esm(__x, __y);
+}
+#endif
+#endif // defined(__riscv_zknd)
+
+#if defined(__riscv_zknd) || defined(__riscv_zkne)
+#if __riscv_xlen == 64
+#define __riscv_aes64ks1i(x, rnum) __builtin_riscv_aes64ks1i(x, rnum)
+
+static __inline__ uint64_t __attribute__((__always_inline__, __nodebug__))
+__riscv_aes64ks2(uint64_t __x, uint64_t __y) {
+ return __builtin_riscv_aes64ks2(__x, __y);
+}
+#endif
+#endif // defined(__riscv_zknd) || defined(__riscv_zkne)
+
+#if defined(__riscv_zknh)
+static __inline__ uint32_t __attribute__((__always_inline__, __nodebug__))
+__riscv_sha256sig0(uint32_t __x) {
+ return __builtin_riscv_sha256sig0(__x);
+}
+
+static __inline__ uint32_t __attribute__((__always_inline__, __nodebug__))
+__riscv_sha256sig1(uint32_t __x) {
+ return __builtin_riscv_sha256sig1(__x);
+}
+
+static __inline__ uint32_t __attribute__((__always_inline__, __nodebug__))
+__riscv_sha256sum0(uint32_t __x) {
+ return __builtin_riscv_sha256sum0(__x);
+}
+
+static __inline__ uint32_t __attribute__((__always_inline__, __nodebug__))
+__riscv_sha256sum1(uint32_t __x) {
+ return __builtin_riscv_sha256sum1(__x);
+}
+
+#if __riscv_xlen == 32
+static __inline__ uint32_t __attribute__((__always_inline__, __nodebug__))
+__riscv_sha512sig0h(uint32_t __x, uint32_t __y) {
+ return __builtin_riscv_sha512sig0h(__x, __y);
+}
+
+static __inline__ uint32_t __attribute__((__always_inline__, __nodebug__))
+__riscv_sha512sig0l(uint32_t __x, uint32_t __y) {
+ return __builtin_riscv_sha512sig0l(__x, __y);
+}
+
+static __inline__ uint32_t __attribute__((__always_inline__, __nodebug__))
+__riscv_sha512sig1h(uint32_t __x, uint32_t __y) {
+ return __builtin_riscv_sha512sig1h(__x, __y);
+}
+
+static __inline__ uint32_t __attribute__((__always_inline__, __nodebug__))
+__riscv_sha512sig1l(uint32_t __x, uint32_t __y) {
+ return __builtin_riscv_sha512sig1l(__x, __y);
+}
+
+static __inline__ uint32_t __attribute__((__always_inline__, __nodebug__))
+__riscv_sha512sum0l(uint32_t __x, uint32_t __y) {
+ return __builtin_riscv_sha512sum0l(__x, __y);
+}
+
+static __inline__ uint32_t __attribute__((__always_inline__, __nodebug__))
+__riscv_sha512sum0r(uint32_t __x, uint32_t __y) {
+ return __builtin_riscv_sha512sum0r(__x, __y);
+}
+
+static __inline__ uint32_t __attribute__((__always_inline__, __nodebug__))
+__riscv_sha512sum1l(uint32_t __x, uint32_t __y) {
+ return __builtin_riscv_sha512sum1l(__x, __y);
+}
+
+static __inline__ uint32_t __attribute__((__always_inline__, __nodebug__))
+__riscv_sha512sum1r(uint32_t __x, uint32_t __y) {
+ return __builtin_riscv_sha512sum1r(__x, __y);
+}
+#endif
+
+#if __riscv_xlen == 64
+static __inline__ uint64_t __attribute__((__always_inline__, __nodebug__))
+__riscv_sha512sig0(uint64_t __x) {
+ return __builtin_riscv_sha512sig0(__x);
+}
+
+static __inline__ uint64_t __attribute__((__always_inline__, __nodebug__))
+__riscv_sha512sig1(uint64_t __x) {
+ return __builtin_riscv_sha512sig1(__x);
+}
+
+static __inline__ uint64_t __attribute__((__always_inline__, __nodebug__))
+__riscv_sha512sum0(uint64_t __x) {
+ return __builtin_riscv_sha512sum0(__x);
+}
+
+static __inline__ uint64_t __attribute__((__always_inline__, __nodebug__))
+__riscv_sha512sum1(uint64_t __x) {
+ return __builtin_riscv_sha512sum1(__x);
+}
+#endif
+#endif // defined(__riscv_zknh)
+
+#if defined(__riscv_zksh)
+static __inline__ uint32_t __attribute__((__always_inline__, __nodebug__))
+__riscv_sm3p0(uint32_t __x) {
+ return __builtin_riscv_sm3p0(__x);
+}
+
+static __inline__ uint32_t __attribute__((__always_inline__, __nodebug__))
+__riscv_sm3p1(uint32_t __x) {
+ return __builtin_riscv_sm3p1(__x);
+}
+#endif // defined(__riscv_zksh)
+
+#if defined(__riscv_zksed)
+#define __riscv_sm4ed(x, y, bs) __builtin_riscv_sm4ed(x, y, bs);
+#define __riscv_sm4ks(x, y, bs) __builtin_riscv_sm4ks(x, y, bs);
+#endif // defined(__riscv_zksh)
+
+#if defined(__cplusplus)
+}
+#endif
+
+#endif
Index: clang/lib/Headers/CMakeLists.txt
===================================================================
--- clang/lib/Headers/CMakeLists.txt
+++ clang/lib/Headers/CMakeLists.txt
@@ -99,6 +99,7 @@
)
set(riscv_files
+ riscv_crypto.h
riscv_ntlh.h
)
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
