@@ -80,6 +80,8 @@ def XD_IN32X : ExtInfo_rr<Zdinx32Ext, GPR, FPR64IN32X>;
80
80
def XD_64 : ExtInfo_rr<D64Ext, GPR, FPR64>;
81
81
82
82
defvar DINX = [D, D_INX, D_IN32X];
83
+ // TODO: Remove DIN64X when Zdinx for RV32 supported
84
+ defvar DIN64X = [D, D_INX];
83
85
defvar DDINX = [DD, DD_INX, DD_IN32X];
84
86
defvar DXINX = [DX, DX_INX, DX_IN32X];
85
87
defvar DFINX = [DF, DF_INX, DF_IN32X];
@@ -218,6 +220,10 @@ def : InstAlias<"fgt.d $rd, $rs, $rt",
218
220
(FLT_D_INX GPR:$rd, FPR64INX:$rt, FPR64INX:$rs), 0>;
219
221
def : InstAlias<"fge.d $rd, $rs, $rt",
220
222
(FLE_D_INX GPR:$rd, FPR64INX:$rt, FPR64INX:$rs), 0>;
223
+ let usesCustomInserter = 1 in {
224
+ def PseudoQuietFLE_D_INX : PseudoQuietFCMP<FPR64INX>;
225
+ def PseudoQuietFLT_D_INX : PseudoQuietFCMP<FPR64INX>;
226
+ }
221
227
} // Predicates = [HasStdExtZdinx, IsRV64]
222
228
223
229
let Predicates = [HasStdExtZdinx, IsRV32] in {
@@ -241,17 +247,27 @@ let Predicates = [HasStdExtD] in {
241
247
// f64 -> f32, f32 -> f64
242
248
def : Pat<(any_fpround FPR64:$rs1), (FCVT_S_D FPR64:$rs1, FRM_DYN)>;
243
249
def : Pat<(any_fpextend FPR32:$rs1), (FCVT_D_S FPR32:$rs1)>;
250
+ } // Predicates = [HasStdExtD]
251
+
252
+ let Predicates = [HasStdExtZdinx, IsRV64] in {
253
+ /// Float conversion operations
254
+
255
+ // f64 -> f32, f32 -> f64
256
+ def : Pat<(any_fpround FPR64INX:$rs1), (FCVT_S_D_INX FPR64INX:$rs1, FRM_DYN)>;
257
+ def : Pat<(any_fpextend FPR32INX:$rs1), (FCVT_D_S_INX FPR32INX:$rs1)>;
258
+ } // Predicates = [HasStdExtZdinx, IsRV64]
244
259
245
260
// [u]int<->double conversion patterns must be gated on IsRV32 or IsRV64, so
246
261
// are defined later.
247
262
248
263
/// Float arithmetic operations
249
264
250
- def : PatFprFprDynFrm <any_fadd, FADD_D, FPR64 >;
251
- def : PatFprFprDynFrm <any_fsub, FSUB_D, FPR64 >;
252
- def : PatFprFprDynFrm <any_fmul, FMUL_D, FPR64 >;
253
- def : PatFprFprDynFrm <any_fdiv, FDIV_D, FPR64 >;
265
+ defm : PatFprFprDynFrm_m <any_fadd, FADD_D, DINX >;
266
+ defm : PatFprFprDynFrm_m <any_fsub, FSUB_D, DINX >;
267
+ defm : PatFprFprDynFrm_m <any_fmul, FMUL_D, DINX >;
268
+ defm : PatFprFprDynFrm_m <any_fdiv, FDIV_D, DINX >;
254
269
270
+ let Predicates = [HasStdExtD] in {
255
271
def : Pat<(any_fsqrt FPR64:$rs1), (FSQRT_D FPR64:$rs1, FRM_DYN)>;
256
272
257
273
def : Pat<(fneg FPR64:$rs1), (FSGNJN_D $rs1, $rs1)>;
@@ -284,25 +300,64 @@ def : Pat<(any_fma (fneg FPR64:$rs1), FPR64:$rs2, (fneg FPR64:$rs3)),
284
300
// fnmadd: -(rs1 * rs2 + rs3) (the nsz flag on the FMA)
285
301
def : Pat<(fneg (any_fma_nsz FPR64:$rs1, FPR64:$rs2, FPR64:$rs3)),
286
302
(FNMADD_D FPR64:$rs1, FPR64:$rs2, FPR64:$rs3, FRM_DYN)>;
303
+ } // Predicates = [HasStdExtD]
304
+
305
+ let Predicates = [HasStdExtZdinx, IsRV64] in {
306
+ def : Pat<(any_fsqrt FPR64INX:$rs1), (FSQRT_D_INX FPR64INX:$rs1, FRM_DYN)>;
307
+
308
+ def : Pat<(fneg FPR64INX:$rs1), (FSGNJN_D_INX $rs1, $rs1)>;
309
+ def : Pat<(fabs FPR64INX:$rs1), (FSGNJX_D_INX $rs1, $rs1)>;
310
+
311
+ def : Pat<(riscv_fpclass FPR64INX:$rs1), (FCLASS_D_INX $rs1)>;
312
+
313
+ def : PatFprFpr<fcopysign, FSGNJ_D_INX, FPR64INX>;
314
+ def : Pat<(fcopysign FPR64INX:$rs1, (fneg FPR64INX:$rs2)),
315
+ (FSGNJN_D_INX $rs1, $rs2)>;
316
+ def : Pat<(fcopysign FPR64INX:$rs1, FPR32INX:$rs2),
317
+ (FSGNJ_D_INX $rs1, (FCVT_D_S_INX $rs2))>;
318
+ def : Pat<(fcopysign FPR32INX:$rs1, FPR64INX:$rs2),
319
+ (FSGNJ_S_INX $rs1, (FCVT_S_D_INX $rs2, FRM_DYN))>;
320
+
321
+ // fmadd: rs1 * rs2 + rs3
322
+ def : Pat<(any_fma FPR64INX:$rs1, FPR64INX:$rs2, FPR64INX:$rs3),
323
+ (FMADD_D_INX $rs1, $rs2, $rs3, FRM_DYN)>;
324
+
325
+ // fmsub: rs1 * rs2 - rs3
326
+ def : Pat<(any_fma FPR64INX:$rs1, FPR64INX:$rs2, (fneg FPR64INX:$rs3)),
327
+ (FMSUB_D_INX FPR64INX:$rs1, FPR64INX:$rs2, FPR64INX:$rs3, FRM_DYN)>;
328
+
329
+ // fnmsub: -rs1 * rs2 + rs3
330
+ def : Pat<(any_fma (fneg FPR64INX:$rs1), FPR64INX:$rs2, FPR64INX:$rs3),
331
+ (FNMSUB_D_INX FPR64INX:$rs1, FPR64INX:$rs2, FPR64INX:$rs3, FRM_DYN)>;
332
+
333
+ // fnmadd: -rs1 * rs2 - rs3
334
+ def : Pat<(any_fma (fneg FPR64INX:$rs1), FPR64INX:$rs2, (fneg FPR64INX:$rs3)),
335
+ (FNMADD_D_INX FPR64INX:$rs1, FPR64INX:$rs2, FPR64INX:$rs3, FRM_DYN)>;
336
+
337
+ // fnmadd: -(rs1 * rs2 + rs3) (the nsz flag on the FMA)
338
+ def : Pat<(fneg (any_fma_nsz FPR64INX:$rs1, FPR64INX:$rs2, FPR64INX:$rs3)),
339
+ (FNMADD_D_INX FPR64INX:$rs1, FPR64INX:$rs2, FPR64INX:$rs3, FRM_DYN)>;
340
+ } // Predicates = [HasStdExtZdinx, IsRV64]
287
341
288
342
// The ratified 20191213 ISA spec defines fmin and fmax in a way that matches
289
343
// LLVM's fminnum and fmaxnum.
290
344
// <https://github.com/riscv/riscv-isa-manual/commit/cd20cee7efd9bac7c5aa127ec3b451749d2b3cce>.
291
- def : PatFprFpr <fminnum, FMIN_D, FPR64 >;
292
- def : PatFprFpr <fmaxnum, FMAX_D, FPR64 >;
345
+ defm : PatFprFpr_m <fminnum, FMIN_D, DINX >;
346
+ defm : PatFprFpr_m <fmaxnum, FMAX_D, DINX >;
293
347
294
348
/// Setcc
295
349
// FIXME: SETEQ/SETLT/SETLE imply nonans, can we pick better instructions for
296
350
// strict versions of those.
297
351
298
352
// Match non-signaling FEQ_D
299
- def : PatSetCC<FPR64, any_fsetcc, SETEQ, FEQ_D>;
300
- def : PatSetCC<FPR64, any_fsetcc, SETOEQ, FEQ_D>;
301
- def : PatSetCC<FPR64, strict_fsetcc, SETLT, PseudoQuietFLT_D>;
302
- def : PatSetCC<FPR64, strict_fsetcc, SETOLT, PseudoQuietFLT_D>;
303
- def : PatSetCC<FPR64, strict_fsetcc, SETLE, PseudoQuietFLE_D>;
304
- def : PatSetCC<FPR64, strict_fsetcc, SETOLE, PseudoQuietFLE_D>;
353
+ defm : PatSetCC_m< any_fsetcc, SETEQ, FEQ_D, DINX >;
354
+ defm : PatSetCC_m< any_fsetcc, SETOEQ, FEQ_D, DINX >;
355
+ defm : PatSetCC_m< strict_fsetcc, SETLT, PseudoQuietFLT_D, DIN64X >;
356
+ defm : PatSetCC_m< strict_fsetcc, SETOLT, PseudoQuietFLT_D, DIN64X >;
357
+ defm : PatSetCC_m< strict_fsetcc, SETLE, PseudoQuietFLE_D, DIN64X >;
358
+ defm : PatSetCC_m< strict_fsetcc, SETOLE, PseudoQuietFLE_D, DIN64X >;
305
359
360
+ let Predicates = [HasStdExtD] in {
306
361
// Match signaling FEQ_D
307
362
def : Pat<(strict_fsetccs FPR64:$rs1, FPR64:$rs2, SETEQ),
308
363
(AND (FLE_D $rs1, $rs2),
@@ -320,7 +375,29 @@ def : PatSetCC<FPR64, any_fsetccs, SETLT, FLT_D>;
320
375
def : PatSetCC<FPR64, any_fsetccs, SETOLT, FLT_D>;
321
376
def : PatSetCC<FPR64, any_fsetccs, SETLE, FLE_D>;
322
377
def : PatSetCC<FPR64, any_fsetccs, SETOLE, FLE_D>;
378
+ } // Predicates = [HasStdExtD]
379
+
380
+ let Predicates = [HasStdExtZdinx, IsRV64] in {
381
+ // Match signaling FEQ_D
382
+ def : Pat<(strict_fsetccs FPR64INX:$rs1, FPR64INX:$rs2, SETEQ),
383
+ (AND (FLE_D_INX $rs1, $rs2),
384
+ (FLE_D_INX $rs2, $rs1))>;
385
+ def : Pat<(strict_fsetccs FPR64INX:$rs1, FPR64INX:$rs2, SETOEQ),
386
+ (AND (FLE_D_INX $rs1, $rs2),
387
+ (FLE_D_INX $rs2, $rs1))>;
388
+ // If both operands are the same, use a single FLE.
389
+ def : Pat<(strict_fsetccs FPR64INX:$rs1, FPR64INX:$rs1, SETEQ),
390
+ (FLE_D_INX $rs1, $rs1)>;
391
+ def : Pat<(strict_fsetccs FPR64INX:$rs1, FPR64INX:$rs1, SETOEQ),
392
+ (FLE_D_INX $rs1, $rs1)>;
393
+
394
+ def : PatSetCC<FPR64INX, any_fsetccs, SETLT, FLT_D_INX>;
395
+ def : PatSetCC<FPR64INX, any_fsetccs, SETOLT, FLT_D_INX>;
396
+ def : PatSetCC<FPR64INX, any_fsetccs, SETLE, FLE_D_INX>;
397
+ def : PatSetCC<FPR64INX, any_fsetccs, SETOLE, FLE_D_INX>;
398
+ } // Predicates = [HasStdExtZdinx, IsRV64]
323
399
400
+ let Predicates = [HasStdExtD] in {
324
401
defm Select_FPR64 : SelectCC_GPR_rrirr<FPR64>;
325
402
326
403
def PseudoFROUND_D : PseudoFROUND<FPR64>;
@@ -349,6 +426,20 @@ def SplitF64Pseudo
349
426
350
427
} // Predicates = [HasStdExtD]
351
428
429
+ let Predicates = [HasStdExtZdinx, IsRV64] in {
430
+ defm Select_FPR64INX : SelectCC_GPR_rrirr<FPR64INX>;
431
+
432
+ def PseudoFROUND_D_INX : PseudoFROUND<FPR64INX>;
433
+
434
+ /// Loads
435
+ def : Pat<(f64 (load (AddrRegImm GPR:$rs1, simm12:$imm12))),
436
+ (COPY_TO_REGCLASS (LD GPR:$rs1, simm12:$imm12), GPRF64)>;
437
+
438
+ /// Stores
439
+ def : Pat<(store (f64 FPR64INX:$rs2), (AddrRegImm GPR:$rs1, simm12:$imm12)),
440
+ (SD (COPY_TO_REGCLASS FPR64INX:$rs2, GPR), GPR:$rs1, simm12:$imm12)>;
441
+ } // Predicates = [HasStdExtZdinx, IsRV64]
442
+
352
443
let Predicates = [HasStdExtD, IsRV32] in {
353
444
354
445
// double->[u]int. Round-to-zero must be used.
@@ -406,3 +497,40 @@ def : Pat<(i64 (any_llround FPR64:$rs1)), (FCVT_L_D $rs1, FRM_RMM)>;
406
497
def : Pat<(any_sint_to_fp (i64 GPR:$rs1)), (FCVT_D_L GPR:$rs1, FRM_DYN)>;
407
498
def : Pat<(any_uint_to_fp (i64 GPR:$rs1)), (FCVT_D_LU GPR:$rs1, FRM_DYN)>;
408
499
} // Predicates = [HasStdExtD, IsRV64]
500
+
501
+ let Predicates = [HasStdExtZdinx, IsRV64] in {
502
+
503
+ // Moves (no conversion)
504
+ def : Pat<(f64 (bitconvert (i64 GPR:$rs1))), (COPY_TO_REGCLASS GPR:$rs1, GPRF64)>;
505
+ def : Pat<(i64 (bitconvert FPR64INX:$rs1)), (COPY_TO_REGCLASS FPR64INX:$rs1, GPR)>;
506
+
507
+ // Use target specific isd nodes to help us remember the result is sign
508
+ // extended. Matching sext_inreg+fptoui/fptosi may cause the conversion to be
509
+ // duplicated if it has another user that didn't need the sign_extend.
510
+ def : Pat<(riscv_any_fcvt_w_rv64 FPR64INX:$rs1, timm:$frm), (FCVT_W_D_INX $rs1, timm:$frm)>;
511
+ def : Pat<(riscv_any_fcvt_wu_rv64 FPR64INX:$rs1, timm:$frm), (FCVT_WU_D_INX $rs1, timm:$frm)>;
512
+
513
+ // [u]int32->fp
514
+ def : Pat<(any_sint_to_fp (i64 (sexti32 (i64 GPR:$rs1)))), (FCVT_D_W_INX $rs1)>;
515
+ def : Pat<(any_uint_to_fp (i64 (zexti32 (i64 GPR:$rs1)))), (FCVT_D_WU_INX $rs1)>;
516
+
517
+ // Saturating double->[u]int64.
518
+ def : Pat<(i64 (riscv_fcvt_x FPR64INX:$rs1, timm:$frm)), (FCVT_L_D_INX $rs1, timm:$frm)>;
519
+ def : Pat<(i64 (riscv_fcvt_xu FPR64INX:$rs1, timm:$frm)), (FCVT_LU_D_INX $rs1, timm:$frm)>;
520
+
521
+ // double->[u]int64. Round-to-zero must be used.
522
+ def : Pat<(i64 (any_fp_to_sint FPR64INX:$rs1)), (FCVT_L_D_INX FPR64INX:$rs1, FRM_RTZ)>;
523
+ def : Pat<(i64 (any_fp_to_uint FPR64INX:$rs1)), (FCVT_LU_D_INX FPR64INX:$rs1, FRM_RTZ)>;
524
+
525
+ // double->int64 with current rounding mode.
526
+ def : Pat<(i64 (any_lrint FPR64INX:$rs1)), (FCVT_L_D_INX $rs1, FRM_DYN)>;
527
+ def : Pat<(i64 (any_llrint FPR64INX:$rs1)), (FCVT_L_D_INX $rs1, FRM_DYN)>;
528
+
529
+ // double->int64 rounded to nearest with ties rounded away from zero.
530
+ def : Pat<(i64 (any_lround FPR64INX:$rs1)), (FCVT_L_D_INX $rs1, FRM_RMM)>;
531
+ def : Pat<(i64 (any_llround FPR64INX:$rs1)), (FCVT_L_D_INX $rs1, FRM_RMM)>;
532
+
533
+ // [u]int64->fp. Match GCC and default to using dynamic rounding mode.
534
+ def : Pat<(any_sint_to_fp (i64 GPR:$rs1)), (FCVT_D_L_INX GPR:$rs1, FRM_DYN)>;
535
+ def : Pat<(any_uint_to_fp (i64 GPR:$rs1)), (FCVT_D_LU_INX GPR:$rs1, FRM_DYN)>;
536
+ } // Predicates = [HasStdExtZdinx, IsRV64]
0 commit comments