Skip to content

Reapply "[SPARC] Use umulxhi to do extending 64x64->128 multiply when we have VIS3" (#135897) #136475

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 22, 2025
Merged

Reapply "[SPARC] Use umulxhi to do extending 64x64->128 multiply when we have VIS3" (#135897) #136475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions llvm/lib/Target/Sparc/SparcISelLowering.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1857,8 +1857,10 @@ SparcTargetLowering::SparcTargetLowering(const TargetMachine &TM,
if (Subtarget->is64Bit()) {
setOperationAction(ISD::UMUL_LOHI, MVT::i64, Expand);
setOperationAction(ISD::SMUL_LOHI, MVT::i64, Expand);
setOperationAction(ISD::MULHU, MVT::i64, Expand);
setOperationAction(ISD::MULHS, MVT::i64, Expand);
setOperationAction(ISD::MULHU, MVT::i64,
Subtarget->isVIS3() ? Legal : Expand);
setOperationAction(ISD::MULHS, MVT::i64,
Subtarget->isVIS3() ? Legal : Expand);

setOperationAction(ISD::SHL_PARTS, MVT::i64, Expand);
setOperationAction(ISD::SRA_PARTS, MVT::i64, Expand);
Expand Down
10 changes: 10 additions & 0 deletions llvm/lib/Target/Sparc/SparcInstrVIS.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,16 @@ def : Pat<(f32 fpnegimm0), (FNEGS (FZEROS))>;
let Predicates = [HasVIS3] in {
def : Pat<(i64 (adde i64:$lhs, i64:$rhs)), (ADDXCCC $lhs, $rhs)>;

def : Pat<(i64 (mulhu i64:$lhs, i64:$rhs)), (UMULXHI $lhs, $rhs)>;
// Signed "MULXHI".
// Based on the formula presented in OSA2011 §7.140, but with bitops to select
// the values to be added.
// TODO: This expansion should probably be moved to DAG legalization phase.
def : Pat<(i64 (mulhs i64:$lhs, i64:$rhs)),
(SUBrr (UMULXHI $lhs, $rhs),
(ADDrr (ANDrr (SRAXri $lhs, 63), $rhs),
(ANDrr (SRAXri $rhs, 63), $lhs)))>;

def : Pat<(i64 (ctlz i64:$src)), (LZCNT $src)>;
def : Pat<(i64 (ctlz_zero_undef i64:$src)), (LZCNT $src)>;
// 32-bit LZCNT.
Expand Down
59 changes: 59 additions & 0 deletions llvm/test/CodeGen/SPARC/multiply-extension.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 5
; RUN: llc < %s -mtriple=sparcv9 | FileCheck %s -check-prefix=V9
; RUN: llc < %s -mtriple=sparcv9 -mattr=+vis3 | FileCheck %s -check-prefix=VIS3

define i128 @signed_multiply_extend(i64 %0, i64 %1) nounwind {
; V9-LABEL: signed_multiply_extend:
; V9: ! %bb.0:
; V9-NEXT: save %sp, -176, %sp
; V9-NEXT: mov %i1, %o1
; V9-NEXT: mov %i0, %o3
; V9-NEXT: srax %i0, 63, %o2
; V9-NEXT: call __multi3
; V9-NEXT: srax %i1, 63, %o0
; V9-NEXT: mov %o0, %i0
; V9-NEXT: ret
; V9-NEXT: restore %g0, %o1, %o1
;
; VIS3-LABEL: signed_multiply_extend:
; VIS3: ! %bb.0:
; VIS3-NEXT: srax %o0, 63, %o2
; VIS3-NEXT: and %o2, %o1, %o2
; VIS3-NEXT: srax %o1, 63, %o3
; VIS3-NEXT: and %o3, %o0, %o3
; VIS3-NEXT: add %o3, %o2, %o2
; VIS3-NEXT: umulxhi %o1, %o0, %o3
; VIS3-NEXT: sub %o3, %o2, %o2
; VIS3-NEXT: mulx %o1, %o0, %o1
; VIS3-NEXT: retl
; VIS3-NEXT: mov %o2, %o0
%3 = sext i64 %0 to i128
%4 = sext i64 %1 to i128
%5 = mul nsw i128 %4, %3
ret i128 %5
}

define i128 @unsigned_multiply_extend(i64 %0, i64 %1) nounwind {
; V9-LABEL: unsigned_multiply_extend:
; V9: ! %bb.0:
; V9-NEXT: save %sp, -176, %sp
; V9-NEXT: mov %i1, %o1
; V9-NEXT: mov %i0, %o3
; V9-NEXT: mov %g0, %o0
; V9-NEXT: call __multi3
; V9-NEXT: mov %g0, %o2
; V9-NEXT: mov %o0, %i0
; V9-NEXT: ret
; V9-NEXT: restore %g0, %o1, %o1
;
; VIS3-LABEL: unsigned_multiply_extend:
; VIS3: ! %bb.0:
; VIS3-NEXT: umulxhi %o1, %o0, %o2
; VIS3-NEXT: mulx %o1, %o0, %o1
; VIS3-NEXT: retl
; VIS3-NEXT: mov %o2, %o0
%3 = zext i64 %0 to i128
%4 = zext i64 %1 to i128
%5 = mul nuw i128 %4, %3
ret i128 %5
}
44 changes: 44 additions & 0 deletions llvm/test/CodeGen/SPARC/smulo-128-legalisation-lowering.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
; RUN: llc < %s -mtriple=sparc-unknown-linux-gnu | FileCheck %s --check-prefixes=SPARC
; RUN: llc < %s -mtriple=sparc64-unknown-linux-gnu | FileCheck %s --check-prefixes=SPARC64
; RUN: llc < %s -mtriple=sparc64-unknown-linux-gnu -mattr=vis3 | FileCheck %s --check-prefixes=SPARC64-VIS3

define { i128, i8 } @muloti_test(i128 %l, i128 %r) nounwind {
; SPARC-LABEL: muloti_test:
Expand Down Expand Up @@ -213,6 +214,49 @@ define { i128, i8 } @muloti_test(i128 %l, i128 %r) nounwind {
; SPARC64-NEXT: srl %i3, 0, %i2
; SPARC64-NEXT: ret
; SPARC64-NEXT: restore
;
; SPARC64-VIS3-LABEL: muloti_test:
; SPARC64-VIS3: .register %g2, #scratch
; SPARC64-VIS3-NEXT: .register %g3, #scratch
; SPARC64-VIS3-NEXT: ! %bb.0: ! %start
; SPARC64-VIS3-NEXT: save %sp, -128, %sp
; SPARC64-VIS3-NEXT: mov %g0, %i5
; SPARC64-VIS3-NEXT: umulxhi %i0, %i3, %i4
; SPARC64-VIS3-NEXT: srax %i0, 63, %g2
; SPARC64-VIS3-NEXT: mulx %g2, %i3, %g3
; SPARC64-VIS3-NEXT: add %i4, %g3, %i4
; SPARC64-VIS3-NEXT: umulxhi %i1, %i3, %g3
; SPARC64-VIS3-NEXT: mulx %i0, %i3, %g4
; SPARC64-VIS3-NEXT: addcc %g4, %g3, %g3
; SPARC64-VIS3-NEXT: addxccc %i4, %g0, %g4
; SPARC64-VIS3-NEXT: umulxhi %i1, %i2, %i4
; SPARC64-VIS3-NEXT: srax %i2, 63, %g5
; SPARC64-VIS3-NEXT: mulx %i1, %g5, %l0
; SPARC64-VIS3-NEXT: add %i4, %l0, %l0
; SPARC64-VIS3-NEXT: mulx %i1, %i2, %i4
; SPARC64-VIS3-NEXT: addcc %i4, %g3, %i4
; SPARC64-VIS3-NEXT: addxccc %l0, %g0, %g3
; SPARC64-VIS3-NEXT: srax %g3, 63, %l0
; SPARC64-VIS3-NEXT: addcc %g4, %g3, %g3
; SPARC64-VIS3-NEXT: srax %g4, 63, %g4
; SPARC64-VIS3-NEXT: addxccc %g4, %l0, %g4
; SPARC64-VIS3-NEXT: and %g5, %i0, %g5
; SPARC64-VIS3-NEXT: and %g2, %i2, %g2
; SPARC64-VIS3-NEXT: add %g2, %g5, %g2
; SPARC64-VIS3-NEXT: umulxhi %i0, %i2, %g5
; SPARC64-VIS3-NEXT: sub %g5, %g2, %g2
; SPARC64-VIS3-NEXT: mulx %i0, %i2, %i0
; SPARC64-VIS3-NEXT: addcc %i0, %g3, %i0
; SPARC64-VIS3-NEXT: addxccc %g2, %g4, %i2
; SPARC64-VIS3-NEXT: srax %i4, 63, %g2
; SPARC64-VIS3-NEXT: xor %i2, %g2, %i2
; SPARC64-VIS3-NEXT: xor %i0, %g2, %i0
; SPARC64-VIS3-NEXT: or %i0, %i2, %i0
; SPARC64-VIS3-NEXT: movrnz %i0, 1, %i5
; SPARC64-VIS3-NEXT: mulx %i1, %i3, %i1
; SPARC64-VIS3-NEXT: srl %i5, 0, %i2
; SPARC64-VIS3-NEXT: ret
; SPARC64-VIS3-NEXT: restore %g0, %i4, %o0
start:
%0 = tail call { i128, i1 } @llvm.smul.with.overflow.i128(i128 %l, i128 %r)
%1 = extractvalue { i128, i1 } %0, 0
Expand Down
33 changes: 33 additions & 0 deletions llvm/test/CodeGen/SPARC/umulo-128-legalisation-lowering.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
; RUN: llc < %s -mtriple=sparc-unknown-linux-gnu | FileCheck %s --check-prefixes=SPARC
; RUN: llc < %s -mtriple=sparc64-unknown-linux-gnu | FileCheck %s --check-prefixes=SPARC64
; RUN: llc < %s -mtriple=sparc64-unknown-linux-gnu -mattr=vis3 | FileCheck %s --check-prefixes=SPARC64-VIS3

define { i128, i8 } @muloti_test(i128 %l, i128 %r) nounwind {
; SPARC-LABEL: muloti_test:
Expand Down Expand Up @@ -199,6 +200,38 @@ define { i128, i8 } @muloti_test(i128 %l, i128 %r) nounwind {
; SPARC64-NEXT: srl %i1, 0, %i2
; SPARC64-NEXT: ret
; SPARC64-NEXT: restore %g0, %o1, %o1
;
; SPARC64-VIS3-LABEL: muloti_test:
; SPARC64-VIS3: .register %g2, #scratch
; SPARC64-VIS3-NEXT: .register %g3, #scratch
; SPARC64-VIS3-NEXT: ! %bb.0: ! %start
; SPARC64-VIS3-NEXT: save %sp, -128, %sp
; SPARC64-VIS3-NEXT: mov %g0, %i5
; SPARC64-VIS3-NEXT: mov %g0, %g2
; SPARC64-VIS3-NEXT: mov %g0, %g3
; SPARC64-VIS3-NEXT: mov %g0, %g4
; SPARC64-VIS3-NEXT: mov %g0, %g5
; SPARC64-VIS3-NEXT: mulx %i2, %i1, %i4
; SPARC64-VIS3-NEXT: mulx %i0, %i3, %l0
; SPARC64-VIS3-NEXT: add %l0, %i4, %i4
; SPARC64-VIS3-NEXT: umulxhi %i1, %i3, %l0
; SPARC64-VIS3-NEXT: add %l0, %i4, %i4
; SPARC64-VIS3-NEXT: cmp %i4, %l0
; SPARC64-VIS3-NEXT: movrnz %i2, 1, %g2
; SPARC64-VIS3-NEXT: movrnz %i0, 1, %g3
; SPARC64-VIS3-NEXT: and %g3, %g2, %g2
; SPARC64-VIS3-NEXT: umulxhi %i0, %i3, %i0
; SPARC64-VIS3-NEXT: movrnz %i0, 1, %g4
; SPARC64-VIS3-NEXT: movcs %xcc, 1, %i5
; SPARC64-VIS3-NEXT: or %g2, %g4, %i0
; SPARC64-VIS3-NEXT: umulxhi %i2, %i1, %i2
; SPARC64-VIS3-NEXT: movrnz %i2, 1, %g5
; SPARC64-VIS3-NEXT: or %i0, %g5, %i0
; SPARC64-VIS3-NEXT: or %i0, %i5, %i0
; SPARC64-VIS3-NEXT: mulx %i1, %i3, %i1
; SPARC64-VIS3-NEXT: srl %i0, 0, %i2
; SPARC64-VIS3-NEXT: ret
; SPARC64-VIS3-NEXT: restore %g0, %i4, %o0
start:
%0 = tail call { i128, i1 } @llvm.umul.with.overflow.i128(i128 %l, i128 %r)
%1 = extractvalue { i128, i1 } %0, 0
Expand Down
Loading