This is an archive of the discontinued LLVM Phabricator instance.

Differential D81712

[NFC][PowerPC] Add a multiclass for fsetcc to define them in a uniform way
ClosedPublic

Authored by steven.zhang on Jun 11 2020, 8:39 PM.

Details

Reviewers
nemanjai
qiucf
shchenz
Group Reviewers
Restricted Project
Commits
rG62e4644616dc: [NFC][PowerPC] Add a multiclass for fsetcc to define them in a uniform way
Summary

This is a refactor patch to prepare for adding the support for strict-fsetcc in PowerPC backend. We want to move their definition into a uniform way so that, we could add the strict node easier.

Diff Detail

Event Timeline

steven.zhang created this revision.Jun 11 2020, 8:39 PM
Herald added a project: Restricted Project. · View Herald TranscriptJun 11 2020, 8:39 PM
Herald added subscribers: shchenz, • wuzish, kbarton, hiraditya. · View Herald Transcript
steven.zhang updated this revision to Diff 270300.Jun 11 2020, 9:01 PM
Harbormaster failed remote builds in B60068: Diff 270296!Jun 11 2020, 9:25 PM
Harbormaster failed remote builds in B60069: Diff 270300!Jun 11 2020, 9:57 PM
steven.zhang added a child revision: D81727: [PowerPC] Support constrained fp operation for setcc.Jun 12 2020, 3:05 AM
nemanjai added a comment.Jun 15 2020, 3:28 AM

This is a nice refactor. The only thing I would like to see is a statement to indicate that you have ensured that PPCGenDAGISel.inc is identical before and after this patch.

llvm/lib/Target/PowerPC/PPCInstrInfo.td
3947

Unrelated and unnecessary whitespace addition.

steven.zhang added a comment.Jun 15 2020, 7:38 PM
In D81712#2092464, @nemanjai wrote:

This is a nice refactor. The only thing I would like to see is a statement to indicate that you have ensured that PPCGenDAGISel.inc is identical before and after this patch.

Yes, they are completely the same. I will remove that whitespace when I commit this patch.

steven.zhang marked an inline comment as done.Jun 22 2020, 4:18 PM

Gentle ping...

steven.zhang added a comment.Jun 28 2020, 6:43 PM

Gentle ping

steven.zhang added a comment.Jul 16 2020, 2:40 AM

Ping ...

shchenz accepted this revision.Jul 16 2020, 6:36 PM

LGTM. Please fix the redundant line in @nemanjai comments when you commit this.

This revision is now accepted and ready to land.Jul 16 2020, 6:36 PM
This revision was landed with ongoing or failed builds.Aug 2 2020, 8:41 PM
Closed by commit rG62e4644616dc: [NFC][PowerPC] Add a multiclass for fsetcc to define them in a uniform way (authored by steven.zhang). · Explain Why
This revision was automatically updated to reflect the committed changes.
steven.zhang added a commit: rG62e4644616dc: [NFC][PowerPC] Add a multiclass for fsetcc to define them in a uniform way.

Revision Contents

PathSize
llvm/
lib/
Target/
PowerPC/
126 lines

Diff 282496

llvm/lib/Target/PowerPC/PPCInstrInfo.td

Show First 20 Lines • Show All 3,895 Lines • ▼ Show 20 Linesdefm : CRNotPat<(i1 (setcc i64:$s1, i64:$s2, SETGE)),
(EXTRACT_SUBREG (CMPD $s1, $s2), sub_lt)>; (EXTRACT_SUBREG (CMPD $s1, $s2), sub_lt)>;
defm : CRNotPat<(i1 (setcc i64:$s1, i64:$s2, SETULE)), defm : CRNotPat<(i1 (setcc i64:$s1, i64:$s2, SETULE)),
(EXTRACT_SUBREG (CMPLD $s1, $s2), sub_gt)>; (EXTRACT_SUBREG (CMPLD $s1, $s2), sub_gt)>;
defm : CRNotPat<(i1 (setcc i64:$s1, i64:$s2, SETLE)), defm : CRNotPat<(i1 (setcc i64:$s1, i64:$s2, SETLE)),
(EXTRACT_SUBREG (CMPD $s1, $s2), sub_gt)>; (EXTRACT_SUBREG (CMPD $s1, $s2), sub_gt)>;
defm : CRNotPat<(i1 (setcc i64:$s1, i64:$s2, SETNE)), defm : CRNotPat<(i1 (setcc i64:$s1, i64:$s2, SETNE)),
(EXTRACT_SUBREG (CMPD $s1, $s2), sub_eq)>; (EXTRACT_SUBREG (CMPD $s1, $s2), sub_eq)>;
let Predicates = [HasFPU] in { multiclass FSetCCPat<SDNode SetCC, ValueType Ty, PatLeaf FCmp> {
// Instantiations of CRNotPat for f32. defm : CRNotPat<(i1 (SetCC Ty:$s1, Ty:$s2, SETUGE)),
defm : CRNotPat<(i1 (setcc f32:$s1, f32:$s2, SETUGE)), (EXTRACT_SUBREG (FCmp $s1, $s2), sub_lt)>;
(EXTRACT_SUBREG (FCMPUS $s1, $s2), sub_lt)>; defm : CRNotPat<(i1 (SetCC Ty:$s1, Ty:$s2, SETGE)),
defm : CRNotPat<(i1 (setcc f32:$s1, f32:$s2, SETGE)), (EXTRACT_SUBREG (FCmp $s1, $s2), sub_lt)>;
(EXTRACT_SUBREG (FCMPUS $s1, $s2), sub_lt)>; defm : CRNotPat<(i1 (SetCC Ty:$s1, Ty:$s2, SETULE)),
defm : CRNotPat<(i1 (setcc f32:$s1, f32:$s2, SETULE)), (EXTRACT_SUBREG (FCmp $s1, $s2), sub_gt)>;
(EXTRACT_SUBREG (FCMPUS $s1, $s2), sub_gt)>; defm : CRNotPat<(i1 (SetCC Ty:$s1, Ty:$s2, SETLE)),
defm : CRNotPat<(i1 (setcc f32:$s1, f32:$s2, SETLE)), (EXTRACT_SUBREG (FCmp $s1, $s2), sub_gt)>;
(EXTRACT_SUBREG (FCMPUS $s1, $s2), sub_gt)>; defm : CRNotPat<(i1 (SetCC Ty:$s1, Ty:$s2, SETUNE)),
defm : CRNotPat<(i1 (setcc f32:$s1, f32:$s2, SETUNE)), (EXTRACT_SUBREG (FCmp $s1, $s2), sub_eq)>;
(EXTRACT_SUBREG (FCMPUS $s1, $s2), sub_eq)>; defm : CRNotPat<(i1 (SetCC Ty:$s1, Ty:$s2, SETNE)),
defm : CRNotPat<(i1 (setcc f32:$s1, f32:$s2, SETNE)), (EXTRACT_SUBREG (FCmp $s1, $s2), sub_eq)>;
(EXTRACT_SUBREG (FCMPUS $s1, $s2), sub_eq)>; defm : CRNotPat<(i1 (SetCC Ty:$s1, Ty:$s2, SETO)),
defm : CRNotPat<(i1 (setcc f32:$s1, f32:$s2, SETO)), (EXTRACT_SUBREG (FCmp $s1, $s2), sub_un)>;
(EXTRACT_SUBREG (FCMPUS $s1, $s2), sub_un)>;
def : Pat<(i1 (SetCC Ty:$s1, Ty:$s2, SETOLT)),
// Instantiations of CRNotPat for f64. (EXTRACT_SUBREG (FCmp $s1, $s2), sub_lt)>;
defm : CRNotPat<(i1 (setcc f64:$s1, f64:$s2, SETUGE)), def : Pat<(i1 (SetCC Ty:$s1, Ty:$s2, SETLT)),
(EXTRACT_SUBREG (FCMPUD $s1, $s2), sub_lt)>; (EXTRACT_SUBREG (FCmp $s1, $s2), sub_lt)>;
defm : CRNotPat<(i1 (setcc f64:$s1, f64:$s2, SETGE)), def : Pat<(i1 (SetCC Ty:$s1, Ty:$s2, SETOGT)),
(EXTRACT_SUBREG (FCMPUD $s1, $s2), sub_lt)>; (EXTRACT_SUBREG (FCmp $s1, $s2), sub_gt)>;
defm : CRNotPat<(i1 (setcc f64:$s1, f64:$s2, SETULE)), def : Pat<(i1 (SetCC Ty:$s1, Ty:$s2, SETGT)),
(EXTRACT_SUBREG (FCMPUD $s1, $s2), sub_gt)>; (EXTRACT_SUBREG (FCmp $s1, $s2), sub_gt)>;
defm : CRNotPat<(i1 (setcc f64:$s1, f64:$s2, SETLE)), def : Pat<(i1 (SetCC Ty:$s1, Ty:$s2, SETOEQ)),
(EXTRACT_SUBREG (FCMPUD $s1, $s2), sub_gt)>; (EXTRACT_SUBREG (FCmp $s1, $s2), sub_eq)>;
defm : CRNotPat<(i1 (setcc f64:$s1, f64:$s2, SETUNE)), def : Pat<(i1 (SetCC Ty:$s1, Ty:$s2, SETEQ)),
(EXTRACT_SUBREG (FCMPUD $s1, $s2), sub_eq)>; (EXTRACT_SUBREG (FCmp $s1, $s2), sub_eq)>;
defm : CRNotPat<(i1 (setcc f64:$s1, f64:$s2, SETNE)), def : Pat<(i1 (SetCC Ty:$s1, Ty:$s2, SETUO)),
(EXTRACT_SUBREG (FCMPUD $s1, $s2), sub_eq)>; (EXTRACT_SUBREG (FCmp $s1, $s2), sub_un)>;
defm : CRNotPat<(i1 (setcc f64:$s1, f64:$s2, SETO)),
(EXTRACT_SUBREG (FCMPUD $s1, $s2), sub_un)>;
// Instantiations of CRNotPat for f128.
defm : CRNotPat<(i1 (setcc f128:$s1, f128:$s2, SETUGE)),
(EXTRACT_SUBREG (XSCMPUQP $s1, $s2), sub_lt)>;
defm : CRNotPat<(i1 (setcc f128:$s1, f128:$s2, SETGE)),
(EXTRACT_SUBREG (XSCMPUQP $s1, $s2), sub_lt)>;
defm : CRNotPat<(i1 (setcc f128:$s1, f128:$s2, SETULE)),
(EXTRACT_SUBREG (XSCMPUQP $s1, $s2), sub_gt)>;
defm : CRNotPat<(i1 (setcc f128:$s1, f128:$s2, SETLE)),
(EXTRACT_SUBREG (XSCMPUQP $s1, $s2), sub_gt)>;
defm : CRNotPat<(i1 (setcc f128:$s1, f128:$s2, SETUNE)),
(EXTRACT_SUBREG (XSCMPUQP $s1, $s2), sub_eq)>;
defm : CRNotPat<(i1 (setcc f128:$s1, f128:$s2, SETNE)),
(EXTRACT_SUBREG (XSCMPUQP $s1, $s2), sub_eq)>;
defm : CRNotPat<(i1 (setcc f128:$s1, f128:$s2, SETO)),
(EXTRACT_SUBREG (XSCMPUQP $s1, $s2), sub_un)>;
} }
// SETCC for f32.
let Predicates = [HasFPU] in { let Predicates = [HasFPU] in {
def : Pat<(i1 (setcc f32:$s1, f32:$s2, SETOLT)), // SETCC for f32.
(EXTRACT_SUBREG (FCMPUS $s1, $s2), sub_lt)>; defm : FSetCCPat<setcc, f32, FCMPUS>;
def : Pat<(i1 (setcc f32:$s1, f32:$s2, SETLT)),
(EXTRACT_SUBREG (FCMPUS $s1, $s2), sub_lt)>;
def : Pat<(i1 (setcc f32:$s1, f32:$s2, SETOGT)),
(EXTRACT_SUBREG (FCMPUS $s1, $s2), sub_gt)>;
def : Pat<(i1 (setcc f32:$s1, f32:$s2, SETGT)),
(EXTRACT_SUBREG (FCMPUS $s1, $s2), sub_gt)>;
def : Pat<(i1 (setcc f32:$s1, f32:$s2, SETOEQ)),
(EXTRACT_SUBREG (FCMPUS $s1, $s2), sub_eq)>;
def : Pat<(i1 (setcc f32:$s1, f32:$s2, SETEQ)),
(EXTRACT_SUBREG (FCMPUS $s1, $s2), sub_eq)>;
def : Pat<(i1 (setcc f32:$s1, f32:$s2, SETUO)),
(EXTRACT_SUBREG (FCMPUS $s1, $s2), sub_un)>;
// SETCC for f64. // SETCC for f64.
def : Pat<(i1 (setcc f64:$s1, f64:$s2, SETOLT)), defm : FSetCCPat<setcc, f64, FCMPUD>;
(EXTRACT_SUBREG (FCMPUD $s1, $s2), sub_lt)>;
def : Pat<(i1 (setcc f64:$s1, f64:$s2, SETLT)),
(EXTRACT_SUBREG (FCMPUD $s1, $s2), sub_lt)>;
def : Pat<(i1 (setcc f64:$s1, f64:$s2, SETOGT)),
(EXTRACT_SUBREG (FCMPUD $s1, $s2), sub_gt)>;
def : Pat<(i1 (setcc f64:$s1, f64:$s2, SETGT)),
(EXTRACT_SUBREG (FCMPUD $s1, $s2), sub_gt)>;
def : Pat<(i1 (setcc f64:$s1, f64:$s2, SETOEQ)),
(EXTRACT_SUBREG (FCMPUD $s1, $s2), sub_eq)>;
def : Pat<(i1 (setcc f64:$s1, f64:$s2, SETEQ)),
(EXTRACT_SUBREG (FCMPUD $s1, $s2), sub_eq)>;
def : Pat<(i1 (setcc f64:$s1, f64:$s2, SETUO)),
(EXTRACT_SUBREG (FCMPUD $s1, $s2), sub_un)>;
// SETCC for f128. // SETCC for f128.
def : Pat<(i1 (setcc f128:$s1, f128:$s2, SETOLT)), defm : FSetCCPat<setcc, f128, XSCMPUQP>;
(EXTRACT_SUBREG (XSCMPUQP $s1, $s2), sub_lt)>;
def : Pat<(i1 (setcc f128:$s1, f128:$s2, SETLT)),
(EXTRACT_SUBREG (XSCMPUQP $s1, $s2), sub_lt)>;
def : Pat<(i1 (setcc f128:$s1, f128:$s2, SETOGT)),
(EXTRACT_SUBREG (XSCMPUQP $s1, $s2), sub_gt)>;
def : Pat<(i1 (setcc f128:$s1, f128:$s2, SETGT)),
(EXTRACT_SUBREG (XSCMPUQP $s1, $s2), sub_gt)>;
def : Pat<(i1 (setcc f128:$s1, f128:$s2, SETOEQ)),
(EXTRACT_SUBREG (XSCMPUQP $s1, $s2), sub_eq)>;
def : Pat<(i1 (setcc f128:$s1, f128:$s2, SETEQ)),
(EXTRACT_SUBREG (XSCMPUQP $s1, $s2), sub_eq)>;
def : Pat<(i1 (setcc f128:$s1, f128:$s2, SETUO)),
(EXTRACT_SUBREG (XSCMPUQP $s1, $s2), sub_un)>;
} }
// This must be in this file because it relies on patterns defined in this file // This must be in this file because it relies on patterns defined in this file
nemanjaiUnsubmitted
Done
ReplyInline Actions

Unrelated and unnecessary whitespace addition.

nemanjai: Unrelated and unnecessary whitespace addition.
// after the inclusion of the instruction sets. // after the inclusion of the instruction sets.
let Predicates = [HasSPE] in { let Predicates = [HasSPE] in {
// SETCC for f32. // SETCC for f32.
def : Pat<(i1 (setcc f32:$s1, f32:$s2, SETOLT)), def : Pat<(i1 (setcc f32:$s1, f32:$s2, SETOLT)),
(EXTRACT_SUBREG (EFSCMPLT $s1, $s2), sub_gt)>; (EXTRACT_SUBREG (EFSCMPLT $s1, $s2), sub_gt)>;
def : Pat<(i1 (setcc f32:$s1, f32:$s2, SETLT)), def : Pat<(i1 (setcc f32:$s1, f32:$s2, SETLT)),
(EXTRACT_SUBREG (EFSCMPLT $s1, $s2), sub_gt)>; (EXTRACT_SUBREG (EFSCMPLT $s1, $s2), sub_gt)>;
def : Pat<(i1 (setcc f32:$s1, f32:$s2, SETOGT)), def : Pat<(i1 (setcc f32:$s1, f32:$s2, SETOGT)),
▲ Show 20 Lines • Show All 1,251 Lines • Show Last 20 Lines