Skip to content

Commit a541603

Browse files
LevyHsumemfrob
authored andcommitted
[RISCV] Add IR intrinsics for Zbc extension
Head files are included in a separate patch in case the name needs to be changed. RV32 / 64: clmul clmulh clmulr Differential Revision: https://reviews.llvm.org/D99711
1 parent 1b11755 commit a541603

File tree

8 files changed

+236
-0
lines changed

8 files changed

+236
-0
lines changed

clang/include/clang/Basic/BuiltinsRISCV.def

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@
2121
TARGET_BUILTIN(__builtin_riscv_orc_b_32, "ZiZi", "nc", "experimental-zbb")
2222
TARGET_BUILTIN(__builtin_riscv_orc_b_64, "WiWi", "nc", "experimental-zbb")
2323

24+
// Zbc extension
25+
TARGET_BUILTIN(__builtin_riscv_clmul, "LiLiLi", "nc", "experimental-zbc")
26+
TARGET_BUILTIN(__builtin_riscv_clmulh, "LiLiLi", "nc", "experimental-zbc")
27+
TARGET_BUILTIN(__builtin_riscv_clmulr, "LiLiLi", "nc", "experimental-zbc")
28+
2429
// Zbr extension
2530
TARGET_BUILTIN(__builtin_riscv_crc32_b, "LiLi", "nc", "experimental-zbr")
2631
TARGET_BUILTIN(__builtin_riscv_crc32_h, "LiLi", "nc", "experimental-zbr")

clang/lib/CodeGen/CGBuiltin.cpp

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17884,6 +17884,20 @@ Value *CodeGenFunction::EmitRISCVBuiltinExpr(unsigned BuiltinID,
1788417884
IntrinsicTypes = {ResultType};
1788517885
break;
1788617886

17887+
// Zbc
17888+
case RISCV::BI__builtin_riscv_clmul:
17889+
ID = Intrinsic::riscv_clmul;
17890+
IntrinsicTypes = {ResultType};
17891+
break;
17892+
case RISCV::BI__builtin_riscv_clmulh:
17893+
ID = Intrinsic::riscv_clmulh;
17894+
IntrinsicTypes = {ResultType};
17895+
break;
17896+
case RISCV::BI__builtin_riscv_clmulr:
17897+
ID = Intrinsic::riscv_clmulr;
17898+
IntrinsicTypes = {ResultType};
17899+
break;
17900+
1788717901
// Zbr
1788817902
case RISCV::BI__builtin_riscv_crc32_b:
1788917903
ID = Intrinsic::riscv_crc32_b;
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
// NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py
2+
// RUN: %clang_cc1 -triple riscv32 -target-feature +experimental-zbc -emit-llvm %s -o - \
3+
// RUN: | FileCheck %s -check-prefix=RV32ZBC
4+
5+
// RV32ZBC-LABEL: @clmul(
6+
// RV32ZBC-NEXT: entry:
7+
// RV32ZBC-NEXT: [[A_ADDR:%.*]] = alloca i32, align 4
8+
// RV32ZBC-NEXT: [[B_ADDR:%.*]] = alloca i32, align 4
9+
// RV32ZBC-NEXT: store i32 [[A:%.*]], i32* [[A_ADDR]], align 4
10+
// RV32ZBC-NEXT: store i32 [[B:%.*]], i32* [[B_ADDR]], align 4
11+
// RV32ZBC-NEXT: [[TMP0:%.*]] = load i32, i32* [[A_ADDR]], align 4
12+
// RV32ZBC-NEXT: [[TMP1:%.*]] = load i32, i32* [[B_ADDR]], align 4
13+
// RV32ZBC-NEXT: [[TMP2:%.*]] = call i32 @llvm.riscv.clmul.i32(i32 [[TMP0]], i32 [[TMP1]])
14+
// RV32ZBC-NEXT: ret i32 [[TMP2]]
15+
//
16+
long clmul(long a, long b) {
17+
return __builtin_riscv_clmul(a, b);
18+
}
19+
20+
// RV32ZBC-LABEL: @clmulh(
21+
// RV32ZBC-NEXT: entry:
22+
// RV32ZBC-NEXT: [[A_ADDR:%.*]] = alloca i32, align 4
23+
// RV32ZBC-NEXT: [[B_ADDR:%.*]] = alloca i32, align 4
24+
// RV32ZBC-NEXT: store i32 [[A:%.*]], i32* [[A_ADDR]], align 4
25+
// RV32ZBC-NEXT: store i32 [[B:%.*]], i32* [[B_ADDR]], align 4
26+
// RV32ZBC-NEXT: [[TMP0:%.*]] = load i32, i32* [[A_ADDR]], align 4
27+
// RV32ZBC-NEXT: [[TMP1:%.*]] = load i32, i32* [[B_ADDR]], align 4
28+
// RV32ZBC-NEXT: [[TMP2:%.*]] = call i32 @llvm.riscv.clmulh.i32(i32 [[TMP0]], i32 [[TMP1]])
29+
// RV32ZBC-NEXT: ret i32 [[TMP2]]
30+
//
31+
long clmulh(long a, long b) {
32+
return __builtin_riscv_clmulh(a, b);
33+
}
34+
35+
// RV32ZBC-LABEL: @clmulr(
36+
// RV32ZBC-NEXT: entry:
37+
// RV32ZBC-NEXT: [[A_ADDR:%.*]] = alloca i32, align 4
38+
// RV32ZBC-NEXT: [[B_ADDR:%.*]] = alloca i32, align 4
39+
// RV32ZBC-NEXT: store i32 [[A:%.*]], i32* [[A_ADDR]], align 4
40+
// RV32ZBC-NEXT: store i32 [[B:%.*]], i32* [[B_ADDR]], align 4
41+
// RV32ZBC-NEXT: [[TMP0:%.*]] = load i32, i32* [[A_ADDR]], align 4
42+
// RV32ZBC-NEXT: [[TMP1:%.*]] = load i32, i32* [[B_ADDR]], align 4
43+
// RV32ZBC-NEXT: [[TMP2:%.*]] = call i32 @llvm.riscv.clmulr.i32(i32 [[TMP0]], i32 [[TMP1]])
44+
// RV32ZBC-NEXT: ret i32 [[TMP2]]
45+
//
46+
long clmulr(long a, long b) {
47+
return __builtin_riscv_clmulr(a, b);
48+
}
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
// NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py
2+
// RUN: %clang_cc1 -triple riscv64 -target-feature +experimental-zbc -emit-llvm %s -o - \
3+
// RUN: | FileCheck %s -check-prefix=RV64ZBC
4+
5+
// RV64ZBC-LABEL: @clmul(
6+
// RV64ZBC-NEXT: entry:
7+
// RV64ZBC-NEXT: [[A_ADDR:%.*]] = alloca i64, align 8
8+
// RV64ZBC-NEXT: [[B_ADDR:%.*]] = alloca i64, align 8
9+
// RV64ZBC-NEXT: store i64 [[A:%.*]], i64* [[A_ADDR]], align 8
10+
// RV64ZBC-NEXT: store i64 [[B:%.*]], i64* [[B_ADDR]], align 8
11+
// RV64ZBC-NEXT: [[TMP0:%.*]] = load i64, i64* [[A_ADDR]], align 8
12+
// RV64ZBC-NEXT: [[TMP1:%.*]] = load i64, i64* [[B_ADDR]], align 8
13+
// RV64ZBC-NEXT: [[TMP2:%.*]] = call i64 @llvm.riscv.clmul.i64(i64 [[TMP0]], i64 [[TMP1]])
14+
// RV64ZBC-NEXT: ret i64 [[TMP2]]
15+
//
16+
long clmul(long a, long b) {
17+
return __builtin_riscv_clmul(a, b);
18+
}
19+
20+
// RV64ZBC-LABEL: @clmulh(
21+
// RV64ZBC-NEXT: entry:
22+
// RV64ZBC-NEXT: [[A_ADDR:%.*]] = alloca i64, align 8
23+
// RV64ZBC-NEXT: [[B_ADDR:%.*]] = alloca i64, align 8
24+
// RV64ZBC-NEXT: store i64 [[A:%.*]], i64* [[A_ADDR]], align 8
25+
// RV64ZBC-NEXT: store i64 [[B:%.*]], i64* [[B_ADDR]], align 8
26+
// RV64ZBC-NEXT: [[TMP0:%.*]] = load i64, i64* [[A_ADDR]], align 8
27+
// RV64ZBC-NEXT: [[TMP1:%.*]] = load i64, i64* [[B_ADDR]], align 8
28+
// RV64ZBC-NEXT: [[TMP2:%.*]] = call i64 @llvm.riscv.clmulh.i64(i64 [[TMP0]], i64 [[TMP1]])
29+
// RV64ZBC-NEXT: ret i64 [[TMP2]]
30+
//
31+
long clmulh(long a, long b) {
32+
return __builtin_riscv_clmulh(a, b);
33+
}
34+
35+
// RV64ZBC-LABEL: @clmulr(
36+
// RV64ZBC-NEXT: entry:
37+
// RV64ZBC-NEXT: [[A_ADDR:%.*]] = alloca i64, align 8
38+
// RV64ZBC-NEXT: [[B_ADDR:%.*]] = alloca i64, align 8
39+
// RV64ZBC-NEXT: store i64 [[A:%.*]], i64* [[A_ADDR]], align 8
40+
// RV64ZBC-NEXT: store i64 [[B:%.*]], i64* [[B_ADDR]], align 8
41+
// RV64ZBC-NEXT: [[TMP0:%.*]] = load i64, i64* [[A_ADDR]], align 8
42+
// RV64ZBC-NEXT: [[TMP1:%.*]] = load i64, i64* [[B_ADDR]], align 8
43+
// RV64ZBC-NEXT: [[TMP2:%.*]] = call i64 @llvm.riscv.clmulr.i64(i64 [[TMP0]], i64 [[TMP1]])
44+
// RV64ZBC-NEXT: ret i64 [[TMP2]]
45+
//
46+
long clmulr(long a, long b) {
47+
return __builtin_riscv_clmulr(a, b);
48+
}

llvm/include/llvm/IR/IntrinsicsRISCV.td

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,19 @@ let TargetPrefix = "riscv" in {
7676
: Intrinsic<[llvm_any_ty],
7777
[LLVMMatchType<0>],
7878
[IntrNoMem, IntrSpeculatable, IntrWillReturn]>;
79+
class BitManipGPRGPRIntrinsics
80+
: Intrinsic<[llvm_any_ty],
81+
[LLVMMatchType<0>, LLVMMatchType<0>],
82+
[IntrNoMem, IntrSpeculatable, IntrWillReturn]>;
7983

8084
// Zbb
8185
def int_riscv_orc_b : BitManipGPRIntrinsics;
8286

87+
// Zbc
88+
def int_riscv_clmul : BitManipGPRGPRIntrinsics;
89+
def int_riscv_clmulh : BitManipGPRGPRIntrinsics;
90+
def int_riscv_clmulr : BitManipGPRGPRIntrinsics;
91+
8392
// Zbr
8493
def int_riscv_crc32_b : BitManipGPRIntrinsics;
8594
def int_riscv_crc32_h : BitManipGPRIntrinsics;

llvm/lib/Target/RISCV/RISCVInstrInfoB.td

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -898,6 +898,12 @@ let Predicates = [HasStdExtZbb] in {
898898
def : PatGpr<int_riscv_orc_b, ORCB>;
899899
} // Predicates = [HasStdExtZbb]
900900

901+
let Predicates = [HasStdExtZbc] in {
902+
def : PatGprGpr<int_riscv_clmul, CLMUL>;
903+
def : PatGprGpr<int_riscv_clmulh, CLMULH>;
904+
def : PatGprGpr<int_riscv_clmulr, CLMULR>;
905+
} // Predicates = [HasStdExtZbc]
906+
901907
let Predicates = [HasStdExtZbr] in {
902908
def : PatGpr<int_riscv_crc32_b, CRC32B>;
903909
def : PatGpr<int_riscv_crc32_h, CRC32H>;
Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
2+
; RUN: llc -mtriple=riscv32 -mattr=+experimental-b -verify-machineinstrs < %s \
3+
; RUN: | FileCheck %s -check-prefix=RV32IB
4+
; RUN: llc -mtriple=riscv32 -mattr=+experimental-zbc -verify-machineinstrs < %s \
5+
; RUN: | FileCheck %s -check-prefix=RV32IBC
6+
7+
declare i32 @llvm.riscv.clmul.i32(i32 %a, i32 %b)
8+
9+
define i32 @clmul32(i32 %a, i32 %b) nounwind {
10+
; RV32IB-LABEL: clmul32:
11+
; RV32IB: # %bb.0:
12+
; RV32IB-NEXT: clmul a0, a0, a1
13+
; RV32IB-NEXT: ret
14+
;
15+
; RV32IBC-LABEL: clmul32:
16+
; RV32IBC: # %bb.0:
17+
; RV32IBC-NEXT: clmul a0, a0, a1
18+
; RV32IBC-NEXT: ret
19+
%tmp = call i32 @llvm.riscv.clmul.i32(i32 %a, i32 %b)
20+
ret i32 %tmp
21+
}
22+
23+
declare i32 @llvm.riscv.clmulh.i32(i32 %a, i32 %b)
24+
25+
define i32 @clmul32h(i32 %a, i32 %b) nounwind {
26+
; RV32IB-LABEL: clmul32h:
27+
; RV32IB: # %bb.0:
28+
; RV32IB-NEXT: clmulh a0, a0, a1
29+
; RV32IB-NEXT: ret
30+
;
31+
; RV32IBC-LABEL: clmul32h:
32+
; RV32IBC: # %bb.0:
33+
; RV32IBC-NEXT: clmulh a0, a0, a1
34+
; RV32IBC-NEXT: ret
35+
%tmp = call i32 @llvm.riscv.clmulh.i32(i32 %a, i32 %b)
36+
ret i32 %tmp
37+
}
38+
39+
declare i32 @llvm.riscv.clmulr.i32(i32 %a, i32 %b)
40+
41+
define i32 @clmul32r(i32 %a, i32 %b) nounwind {
42+
; RV32IB-LABEL: clmul32r:
43+
; RV32IB: # %bb.0:
44+
; RV32IB-NEXT: clmulr a0, a0, a1
45+
; RV32IB-NEXT: ret
46+
;
47+
; RV32IBC-LABEL: clmul32r:
48+
; RV32IBC: # %bb.0:
49+
; RV32IBC-NEXT: clmulr a0, a0, a1
50+
; RV32IBC-NEXT: ret
51+
%tmp = call i32 @llvm.riscv.clmulr.i32(i32 %a, i32 %b)
52+
ret i32 %tmp
53+
}
Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
2+
; RUN: llc -mtriple=riscv64 -mattr=+experimental-b -verify-machineinstrs < %s \
3+
; RUN: | FileCheck %s -check-prefix=RV64IB
4+
; RUN: llc -mtriple=riscv64 -mattr=+experimental-zbc -verify-machineinstrs < %s \
5+
; RUN: | FileCheck %s -check-prefix=RV64IBC
6+
7+
declare i64 @llvm.riscv.clmul.i64(i64 %a, i64 %b)
8+
9+
define i64 @clmul64(i64 %a, i64 %b) nounwind {
10+
; RV64IB-LABEL: clmul64:
11+
; RV64IB: # %bb.0:
12+
; RV64IB-NEXT: clmul a0, a0, a1
13+
; RV64IB-NEXT: ret
14+
;
15+
; RV64IBC-LABEL: clmul64:
16+
; RV64IBC: # %bb.0:
17+
; RV64IBC-NEXT: clmul a0, a0, a1
18+
; RV64IBC-NEXT: ret
19+
%tmp = call i64 @llvm.riscv.clmul.i64(i64 %a, i64 %b)
20+
ret i64 %tmp
21+
}
22+
23+
declare i64 @llvm.riscv.clmulh.i64(i64 %a, i64 %b)
24+
25+
define i64 @clmul64h(i64 %a, i64 %b) nounwind {
26+
; RV64IB-LABEL: clmul64h:
27+
; RV64IB: # %bb.0:
28+
; RV64IB-NEXT: clmulh a0, a0, a1
29+
; RV64IB-NEXT: ret
30+
;
31+
; RV64IBC-LABEL: clmul64h:
32+
; RV64IBC: # %bb.0:
33+
; RV64IBC-NEXT: clmulh a0, a0, a1
34+
; RV64IBC-NEXT: ret
35+
%tmp = call i64 @llvm.riscv.clmulh.i64(i64 %a, i64 %b)
36+
ret i64 %tmp
37+
}
38+
39+
declare i64 @llvm.riscv.clmulr.i64(i64 %a, i64 %b)
40+
41+
define i64 @clmul64r(i64 %a, i64 %b) nounwind {
42+
; RV64IB-LABEL: clmul64r:
43+
; RV64IB: # %bb.0:
44+
; RV64IB-NEXT: clmulr a0, a0, a1
45+
; RV64IB-NEXT: ret
46+
;
47+
; RV64IBC-LABEL: clmul64r:
48+
; RV64IBC: # %bb.0:
49+
; RV64IBC-NEXT: clmulr a0, a0, a1
50+
; RV64IBC-NEXT: ret
51+
%tmp = call i64 @llvm.riscv.clmulr.i64(i64 %a, i64 %b)
52+
ret i64 %tmp
53+
}

0 commit comments

Comments
 (0)