-
Notifications
You must be signed in to change notification settings - Fork 54
/
Copy path0043-RISCV-Codegen-support-for-the-standard-RV32M-instruc.patch
435 lines (427 loc) · 13.8 KB
/
0043-RISCV-Codegen-support-for-the-standard-RV32M-instruc.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Alex Bradbury <[email protected]>
Subject: [RISCV] Codegen support for the standard RV32M instruction set
extension
---
lib/Target/RISCV/RISCVISelLowering.cpp | 18 +++---
lib/Target/RISCV/RISCVInstrInfoM.td | 15 +++++
test/CodeGen/RISCV/div.ll | 93 +++++++++++++++++++++++++++++-
test/CodeGen/RISCV/mul.ll | 100 ++++++++++++++++++++++++++++++++-
test/CodeGen/RISCV/rem.ll | 14 ++++-
5 files changed, 229 insertions(+), 11 deletions(-)
diff --git a/lib/Target/RISCV/RISCVISelLowering.cpp b/lib/Target/RISCV/RISCVISelLowering.cpp
index d5d23129ff9..40a9683e963 100644
--- a/lib/Target/RISCV/RISCVISelLowering.cpp
+++ b/lib/Target/RISCV/RISCVISelLowering.cpp
@@ -77,18 +77,20 @@ RISCVTargetLowering::RISCVTargetLowering(const TargetMachine &TM,
setOperationAction(ISD::SUBC, XLenVT, Expand);
setOperationAction(ISD::SUBE, XLenVT, Expand);
- setOperationAction(ISD::SREM, XLenVT, Expand);
+ if (!Subtarget.hasStdExtM()) {
+ setOperationAction(ISD::MUL, XLenVT, Expand);
+ setOperationAction(ISD::MULHS, XLenVT, Expand);
+ setOperationAction(ISD::MULHU, XLenVT, Expand);
+ setOperationAction(ISD::SDIV, XLenVT, Expand);
+ setOperationAction(ISD::UDIV, XLenVT, Expand);
+ setOperationAction(ISD::SREM, XLenVT, Expand);
+ setOperationAction(ISD::UREM, XLenVT, Expand);
+ }
+
setOperationAction(ISD::SDIVREM, XLenVT, Expand);
- setOperationAction(ISD::SDIV, XLenVT, Expand);
- setOperationAction(ISD::UREM, XLenVT, Expand);
setOperationAction(ISD::UDIVREM, XLenVT, Expand);
- setOperationAction(ISD::UDIV, XLenVT, Expand);
-
- setOperationAction(ISD::MUL, XLenVT, Expand);
setOperationAction(ISD::SMUL_LOHI, XLenVT, Expand);
setOperationAction(ISD::UMUL_LOHI, XLenVT, Expand);
- setOperationAction(ISD::MULHS, XLenVT, Expand);
- setOperationAction(ISD::MULHU, XLenVT, Expand);
setOperationAction(ISD::SHL_PARTS, XLenVT, Expand);
setOperationAction(ISD::SRL_PARTS, XLenVT, Expand);
diff --git a/lib/Target/RISCV/RISCVInstrInfoM.td b/lib/Target/RISCV/RISCVInstrInfoM.td
index fec9c1f9399..2dd10ada400 100644
--- a/lib/Target/RISCV/RISCVInstrInfoM.td
+++ b/lib/Target/RISCV/RISCVInstrInfoM.td
@@ -34,3 +34,18 @@ def DIVUW : ALUW_rr<0b0000001, 0b101, "divuw">;
def REMW : ALUW_rr<0b0000001, 0b110, "remw">;
def REMUW : ALUW_rr<0b0000001, 0b111, "remuw">;
} // Predicates = [HasStdExtM, IsRV64]
+
+//===----------------------------------------------------------------------===//
+// Pseudo-instructions and codegen patterns
+//===----------------------------------------------------------------------===//
+
+let Predicates = [HasStdExtM] in {
+def : PatGprGpr<mul, MUL>;
+def : PatGprGpr<mulhs, MULH>;
+def : PatGprGpr<mulhu, MULHU>;
+// No ISDOpcode for mulhsu
+def : PatGprGpr<sdiv, DIV>;
+def : PatGprGpr<udiv, DIVU>;
+def : PatGprGpr<srem, REM>;
+def : PatGprGpr<urem, REMU>;
+} // Predicates = [HasStdExtM]
diff --git a/test/CodeGen/RISCV/div.ll b/test/CodeGen/RISCV/div.ll
index c3edbfcb273..b8630bbbc36 100644
--- a/test/CodeGen/RISCV/div.ll
+++ b/test/CodeGen/RISCV/div.ll
@@ -1,6 +1,8 @@
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
; RUN: llc -mtriple=riscv32 -verify-machineinstrs < %s \
-; RUN: | FileCheck %s -check-prefix=RV32I
+; RUN: | FileCheck -check-prefix=RV32I %s
+; RUN: llc -mtriple=riscv32 -mattr=+m -verify-machineinstrs < %s \
+; RUN: | FileCheck -check-prefix=RV32IM %s
define i32 @udiv(i32 %a, i32 %b) nounwind {
; RV32I-LABEL: udiv:
@@ -13,6 +15,11 @@ define i32 @udiv(i32 %a, i32 %b) nounwind {
; RV32I-NEXT: lw ra, 12(sp)
; RV32I-NEXT: addi sp, sp, 16
; RV32I-NEXT: jalr zero, ra, 0
+;
+; RV32IM-LABEL: udiv:
+; RV32IM: # %bb.0:
+; RV32IM-NEXT: divu a0, a0, a1
+; RV32IM-NEXT: jalr zero, ra, 0
%1 = udiv i32 %a, %b
ret i32 %1
}
@@ -29,6 +36,14 @@ define i32 @udiv_constant(i32 %a) nounwind {
; RV32I-NEXT: lw ra, 12(sp)
; RV32I-NEXT: addi sp, sp, 16
; RV32I-NEXT: jalr zero, ra, 0
+;
+; RV32IM-LABEL: udiv_constant:
+; RV32IM: # %bb.0:
+; RV32IM-NEXT: lui a1, 838861
+; RV32IM-NEXT: addi a1, a1, -819
+; RV32IM-NEXT: mulhu a0, a0, a1
+; RV32IM-NEXT: srli a0, a0, 2
+; RV32IM-NEXT: jalr zero, ra, 0
%1 = udiv i32 %a, 5
ret i32 %1
}
@@ -38,6 +53,11 @@ define i32 @udiv_pow2(i32 %a) nounwind {
; RV32I: # %bb.0:
; RV32I-NEXT: srli a0, a0, 3
; RV32I-NEXT: jalr zero, ra, 0
+;
+; RV32IM-LABEL: udiv_pow2:
+; RV32IM: # %bb.0:
+; RV32IM-NEXT: srli a0, a0, 3
+; RV32IM-NEXT: jalr zero, ra, 0
%1 = udiv i32 %a, 8
ret i32 %1
}
@@ -53,6 +73,17 @@ define i64 @udiv64(i64 %a, i64 %b) nounwind {
; RV32I-NEXT: lw ra, 12(sp)
; RV32I-NEXT: addi sp, sp, 16
; RV32I-NEXT: jalr zero, ra, 0
+;
+; RV32IM-LABEL: udiv64:
+; RV32IM: # %bb.0:
+; RV32IM-NEXT: addi sp, sp, -16
+; RV32IM-NEXT: sw ra, 12(sp)
+; RV32IM-NEXT: lui a4, %hi(__udivdi3)
+; RV32IM-NEXT: addi a4, a4, %lo(__udivdi3)
+; RV32IM-NEXT: jalr ra, a4, 0
+; RV32IM-NEXT: lw ra, 12(sp)
+; RV32IM-NEXT: addi sp, sp, 16
+; RV32IM-NEXT: jalr zero, ra, 0
%1 = udiv i64 %a, %b
ret i64 %1
}
@@ -70,6 +101,19 @@ define i64 @udiv64_constant(i64 %a) nounwind {
; RV32I-NEXT: lw ra, 12(sp)
; RV32I-NEXT: addi sp, sp, 16
; RV32I-NEXT: jalr zero, ra, 0
+;
+; RV32IM-LABEL: udiv64_constant:
+; RV32IM: # %bb.0:
+; RV32IM-NEXT: addi sp, sp, -16
+; RV32IM-NEXT: sw ra, 12(sp)
+; RV32IM-NEXT: lui a2, %hi(__udivdi3)
+; RV32IM-NEXT: addi a4, a2, %lo(__udivdi3)
+; RV32IM-NEXT: addi a2, zero, 5
+; RV32IM-NEXT: addi a3, zero, 0
+; RV32IM-NEXT: jalr ra, a4, 0
+; RV32IM-NEXT: lw ra, 12(sp)
+; RV32IM-NEXT: addi sp, sp, 16
+; RV32IM-NEXT: jalr zero, ra, 0
%1 = udiv i64 %a, 5
ret i64 %1
}
@@ -85,6 +129,11 @@ define i32 @sdiv(i32 %a, i32 %b) nounwind {
; RV32I-NEXT: lw ra, 12(sp)
; RV32I-NEXT: addi sp, sp, 16
; RV32I-NEXT: jalr zero, ra, 0
+;
+; RV32IM-LABEL: sdiv:
+; RV32IM: # %bb.0:
+; RV32IM-NEXT: div a0, a0, a1
+; RV32IM-NEXT: jalr zero, ra, 0
%1 = sdiv i32 %a, %b
ret i32 %1
}
@@ -101,6 +150,16 @@ define i32 @sdiv_constant(i32 %a) nounwind {
; RV32I-NEXT: lw ra, 12(sp)
; RV32I-NEXT: addi sp, sp, 16
; RV32I-NEXT: jalr zero, ra, 0
+;
+; RV32IM-LABEL: sdiv_constant:
+; RV32IM: # %bb.0:
+; RV32IM-NEXT: lui a1, 419430
+; RV32IM-NEXT: addi a1, a1, 1639
+; RV32IM-NEXT: mulh a0, a0, a1
+; RV32IM-NEXT: srli a1, a0, 31
+; RV32IM-NEXT: srai a0, a0, 1
+; RV32IM-NEXT: add a0, a0, a1
+; RV32IM-NEXT: jalr zero, ra, 0
%1 = sdiv i32 %a, 5
ret i32 %1
}
@@ -113,6 +172,14 @@ define i32 @sdiv_pow2(i32 %a) nounwind {
; RV32I-NEXT: add a0, a0, a1
; RV32I-NEXT: srai a0, a0, 3
; RV32I-NEXT: jalr zero, ra, 0
+;
+; RV32IM-LABEL: sdiv_pow2:
+; RV32IM: # %bb.0:
+; RV32IM-NEXT: srai a1, a0, 31
+; RV32IM-NEXT: srli a1, a1, 29
+; RV32IM-NEXT: add a0, a0, a1
+; RV32IM-NEXT: srai a0, a0, 3
+; RV32IM-NEXT: jalr zero, ra, 0
%1 = sdiv i32 %a, 8
ret i32 %1
}
@@ -128,6 +195,17 @@ define i64 @sdiv64(i64 %a, i64 %b) nounwind {
; RV32I-NEXT: lw ra, 12(sp)
; RV32I-NEXT: addi sp, sp, 16
; RV32I-NEXT: jalr zero, ra, 0
+;
+; RV32IM-LABEL: sdiv64:
+; RV32IM: # %bb.0:
+; RV32IM-NEXT: addi sp, sp, -16
+; RV32IM-NEXT: sw ra, 12(sp)
+; RV32IM-NEXT: lui a4, %hi(__divdi3)
+; RV32IM-NEXT: addi a4, a4, %lo(__divdi3)
+; RV32IM-NEXT: jalr ra, a4, 0
+; RV32IM-NEXT: lw ra, 12(sp)
+; RV32IM-NEXT: addi sp, sp, 16
+; RV32IM-NEXT: jalr zero, ra, 0
%1 = sdiv i64 %a, %b
ret i64 %1
}
@@ -145,6 +223,19 @@ define i64 @sdiv64_constant(i64 %a) nounwind {
; RV32I-NEXT: lw ra, 12(sp)
; RV32I-NEXT: addi sp, sp, 16
; RV32I-NEXT: jalr zero, ra, 0
+;
+; RV32IM-LABEL: sdiv64_constant:
+; RV32IM: # %bb.0:
+; RV32IM-NEXT: addi sp, sp, -16
+; RV32IM-NEXT: sw ra, 12(sp)
+; RV32IM-NEXT: lui a2, %hi(__divdi3)
+; RV32IM-NEXT: addi a4, a2, %lo(__divdi3)
+; RV32IM-NEXT: addi a2, zero, 5
+; RV32IM-NEXT: addi a3, zero, 0
+; RV32IM-NEXT: jalr ra, a4, 0
+; RV32IM-NEXT: lw ra, 12(sp)
+; RV32IM-NEXT: addi sp, sp, 16
+; RV32IM-NEXT: jalr zero, ra, 0
%1 = sdiv i64 %a, 5
ret i64 %1
}
diff --git a/test/CodeGen/RISCV/mul.ll b/test/CodeGen/RISCV/mul.ll
index 396e0a1437c..454f13e58f0 100644
--- a/test/CodeGen/RISCV/mul.ll
+++ b/test/CodeGen/RISCV/mul.ll
@@ -1,6 +1,8 @@
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
; RUN: llc -mtriple=riscv32 -verify-machineinstrs < %s \
-; RUN: | FileCheck %s -check-prefix=RV32I
+; RUN: | FileCheck -check-prefix=RV32I %s
+; RUN: llc -mtriple=riscv32 -mattr=+m -verify-machineinstrs < %s \
+; RUN: | FileCheck -check-prefix=RV32IM %s
define i32 @square(i32 %a) nounwind {
; RV32I-LABEL: square:
@@ -14,6 +16,11 @@ define i32 @square(i32 %a) nounwind {
; RV32I-NEXT: lw ra, 12(sp)
; RV32I-NEXT: addi sp, sp, 16
; RV32I-NEXT: jalr zero, ra, 0
+;
+; RV32IM-LABEL: square:
+; RV32IM: # %bb.0:
+; RV32IM-NEXT: mul a0, a0, a0
+; RV32IM-NEXT: jalr zero, ra, 0
%1 = mul i32 %a, %a
ret i32 %1
}
@@ -29,6 +36,11 @@ define i32 @mul(i32 %a, i32 %b) nounwind {
; RV32I-NEXT: lw ra, 12(sp)
; RV32I-NEXT: addi sp, sp, 16
; RV32I-NEXT: jalr zero, ra, 0
+;
+; RV32IM-LABEL: mul:
+; RV32IM: # %bb.0:
+; RV32IM-NEXT: mul a0, a0, a1
+; RV32IM-NEXT: jalr zero, ra, 0
%1 = mul i32 %a, %b
ret i32 %1
}
@@ -45,6 +57,12 @@ define i32 @mul_constant(i32 %a) nounwind {
; RV32I-NEXT: lw ra, 12(sp)
; RV32I-NEXT: addi sp, sp, 16
; RV32I-NEXT: jalr zero, ra, 0
+;
+; RV32IM-LABEL: mul_constant:
+; RV32IM: # %bb.0:
+; RV32IM-NEXT: addi a1, zero, 5
+; RV32IM-NEXT: mul a0, a0, a1
+; RV32IM-NEXT: jalr zero, ra, 0
%1 = mul i32 %a, 5
ret i32 %1
}
@@ -54,6 +72,11 @@ define i32 @mul_pow2(i32 %a) nounwind {
; RV32I: # %bb.0:
; RV32I-NEXT: slli a0, a0, 3
; RV32I-NEXT: jalr zero, ra, 0
+;
+; RV32IM-LABEL: mul_pow2:
+; RV32IM: # %bb.0:
+; RV32IM-NEXT: slli a0, a0, 3
+; RV32IM-NEXT: jalr zero, ra, 0
%1 = mul i32 %a, 8
ret i32 %1
}
@@ -69,6 +92,16 @@ define i64 @mul64(i64 %a, i64 %b) nounwind {
; RV32I-NEXT: lw ra, 12(sp)
; RV32I-NEXT: addi sp, sp, 16
; RV32I-NEXT: jalr zero, ra, 0
+;
+; RV32IM-LABEL: mul64:
+; RV32IM: # %bb.0:
+; RV32IM-NEXT: mul a3, a0, a3
+; RV32IM-NEXT: mulhu a4, a0, a2
+; RV32IM-NEXT: add a3, a4, a3
+; RV32IM-NEXT: mul a1, a1, a2
+; RV32IM-NEXT: add a1, a3, a1
+; RV32IM-NEXT: mul a0, a0, a2
+; RV32IM-NEXT: jalr zero, ra, 0
%1 = mul i64 %a, %b
ret i64 %1
}
@@ -86,6 +119,71 @@ define i64 @mul64_constant(i64 %a) nounwind {
; RV32I-NEXT: lw ra, 12(sp)
; RV32I-NEXT: addi sp, sp, 16
; RV32I-NEXT: jalr zero, ra, 0
+;
+; RV32IM-LABEL: mul64_constant:
+; RV32IM: # %bb.0:
+; RV32IM-NEXT: addi a2, zero, 5
+; RV32IM-NEXT: mul a1, a1, a2
+; RV32IM-NEXT: mulhu a3, a0, a2
+; RV32IM-NEXT: add a1, a3, a1
+; RV32IM-NEXT: mul a0, a0, a2
+; RV32IM-NEXT: jalr zero, ra, 0
%1 = mul i64 %a, 5
ret i64 %1
}
+
+define i32 @mulhs(i32 %a, i32 %b) nounwind {
+; RV32I-LABEL: mulhs:
+; RV32I: # %bb.0:
+; RV32I-NEXT: addi sp, sp, -16
+; RV32I-NEXT: sw ra, 12(sp)
+; RV32I-NEXT: addi a2, a1, 0
+; RV32I-NEXT: lui a1, %hi(__muldi3)
+; RV32I-NEXT: addi a4, a1, %lo(__muldi3)
+; RV32I-NEXT: srai a1, a0, 31
+; RV32I-NEXT: srai a3, a2, 31
+; RV32I-NEXT: jalr ra, a4, 0
+; RV32I-NEXT: addi a0, a1, 0
+; RV32I-NEXT: lw ra, 12(sp)
+; RV32I-NEXT: addi sp, sp, 16
+; RV32I-NEXT: jalr zero, ra, 0
+;
+; RV32IM-LABEL: mulhs:
+; RV32IM: # %bb.0:
+; RV32IM-NEXT: mulh a0, a0, a1
+; RV32IM-NEXT: jalr zero, ra, 0
+ %1 = sext i32 %a to i64
+ %2 = sext i32 %b to i64
+ %3 = mul i64 %1, %2
+ %4 = lshr i64 %3, 32
+ %5 = trunc i64 %4 to i32
+ ret i32 %5
+}
+
+define i32 @mulhu(i32 %a, i32 %b) nounwind {
+; RV32I-LABEL: mulhu:
+; RV32I: # %bb.0:
+; RV32I-NEXT: addi sp, sp, -16
+; RV32I-NEXT: sw ra, 12(sp)
+; RV32I-NEXT: addi a2, a1, 0
+; RV32I-NEXT: lui a1, %hi(__muldi3)
+; RV32I-NEXT: addi a4, a1, %lo(__muldi3)
+; RV32I-NEXT: addi a1, zero, 0
+; RV32I-NEXT: addi a3, zero, 0
+; RV32I-NEXT: jalr ra, a4, 0
+; RV32I-NEXT: addi a0, a1, 0
+; RV32I-NEXT: lw ra, 12(sp)
+; RV32I-NEXT: addi sp, sp, 16
+; RV32I-NEXT: jalr zero, ra, 0
+;
+; RV32IM-LABEL: mulhu:
+; RV32IM: # %bb.0:
+; RV32IM-NEXT: mulhu a0, a0, a1
+; RV32IM-NEXT: jalr zero, ra, 0
+ %1 = zext i32 %a to i64
+ %2 = zext i32 %b to i64
+ %3 = mul i64 %1, %2
+ %4 = lshr i64 %3, 32
+ %5 = trunc i64 %4 to i32
+ ret i32 %5
+}
diff --git a/test/CodeGen/RISCV/rem.ll b/test/CodeGen/RISCV/rem.ll
index 5f896ac2705..4e1e0ac81df 100644
--- a/test/CodeGen/RISCV/rem.ll
+++ b/test/CodeGen/RISCV/rem.ll
@@ -1,6 +1,8 @@
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
; RUN: llc -mtriple=riscv32 -verify-machineinstrs < %s \
-; RUN: | FileCheck %s -check-prefix=RV32I
+; RUN: | FileCheck -check-prefix=RV32I %s
+; RUN: llc -mtriple=riscv32 -mattr=+m -verify-machineinstrs < %s \
+; RUN: | FileCheck -check-prefix=RV32IM %s
define i32 @urem(i32 %a, i32 %b) nounwind {
; RV32I-LABEL: urem:
@@ -13,6 +15,11 @@ define i32 @urem(i32 %a, i32 %b) nounwind {
; RV32I-NEXT: lw ra, 12(sp)
; RV32I-NEXT: addi sp, sp, 16
; RV32I-NEXT: jalr zero, ra, 0
+;
+; RV32IM-LABEL: urem:
+; RV32IM: # %bb.0:
+; RV32IM-NEXT: remu a0, a0, a1
+; RV32IM-NEXT: jalr zero, ra, 0
%1 = urem i32 %a, %b
ret i32 %1
}
@@ -28,6 +35,11 @@ define i32 @srem(i32 %a, i32 %b) nounwind {
; RV32I-NEXT: lw ra, 12(sp)
; RV32I-NEXT: addi sp, sp, 16
; RV32I-NEXT: jalr zero, ra, 0
+;
+; RV32IM-LABEL: srem:
+; RV32IM: # %bb.0:
+; RV32IM-NEXT: rem a0, a0, a1
+; RV32IM-NEXT: jalr zero, ra, 0
%1 = srem i32 %a, %b
ret i32 %1
}
--
2.16.2