Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion llvm/lib/Target/AMDGPU/AMDGPURegBankLegalizeRules.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -935,7 +935,7 @@ RegBankLegalizeRules::RegBankLegalizeRules(const GCNSubtarget &_ST,

bool hasSALUFloat = ST->hasSALUFloatInsts();

addRulesForGOpcs({G_FADD}, Standard)
addRulesForGOpcs({G_FADD, G_FMUL}, Standard)
.Uni(S16, {{UniInVgprS16}, {Vgpr16, Vgpr16}}, !hasSALUFloat)
.Uni(S16, {{Sgpr16}, {Sgpr16, Sgpr16}}, hasSALUFloat)
.Div(S16, {{Vgpr16}, {Vgpr16, Vgpr16}})
Expand Down
165 changes: 165 additions & 0 deletions llvm/test/CodeGen/AMDGPU/GlobalISel/fmul.ll
Original file line number Diff line number Diff line change
@@ -0,0 +1,165 @@
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
; RUN: llc -global-isel -new-reg-bank-select -mtriple=amdgcn-amd-amdpal -mattr=-real-true16 -mcpu=gfx1100 -o - %s | FileCheck -check-prefixes=GCN,GFX11,GFX11-FAKE16 %s
; RUN: llc -global-isel -new-reg-bank-select -mtriple=amdgcn-amd-amdpal -mattr=+real-true16 -mcpu=gfx1100 -o - %s | FileCheck -check-prefixes=GCN,GFX11,GFX11-TRUE16 %s
; RUN: llc -global-isel -new-reg-bank-select -mtriple=amdgcn-amd-amdpal -mattr=-real-true16 -mcpu=gfx1200 -o - %s | FileCheck -check-prefixes=GCN,GFX12,GFX12-FAKE16 %s
; RUN: llc -global-isel -new-reg-bank-select -mtriple=amdgcn-amd-amdpal -mattr=+real-true16 -mcpu=gfx1200 -o - %s | FileCheck -check-prefixes=GCN,GFX12,GFX12-TRUE16 %s

define amdgpu_ps half @fmul_s16_uniform(half inreg %a, half inreg %b) {
; GFX11-FAKE16-LABEL: fmul_s16_uniform:
; GFX11-FAKE16: ; %bb.0:
; GFX11-FAKE16-NEXT: v_mul_f16_e64 v0, s0, s1
; GFX11-FAKE16-NEXT: ; return to shader part epilog
;
; GFX11-TRUE16-LABEL: fmul_s16_uniform:
; GFX11-TRUE16: ; %bb.0:
; GFX11-TRUE16-NEXT: v_mul_f16_e64 v0.l, s0, s1
; GFX11-TRUE16-NEXT: ; return to shader part epilog
;
; GFX12-LABEL: fmul_s16_uniform:
; GFX12: ; %bb.0:
; GFX12-NEXT: s_mul_f16 s0, s0, s1
; GFX12-NEXT: s_delay_alu instid0(SALU_CYCLE_3)
; GFX12-NEXT: v_mov_b32_e32 v0, s0
; GFX12-NEXT: ; return to shader part epilog
%result = fmul half %a, %b
ret half %result
}

define amdgpu_ps half @fmul_s16_div(half %a, half %b) {
; GFX11-FAKE16-LABEL: fmul_s16_div:
; GFX11-FAKE16: ; %bb.0:
; GFX11-FAKE16-NEXT: v_mul_f16_e32 v0, v0, v1
; GFX11-FAKE16-NEXT: ; return to shader part epilog
;
; GFX11-TRUE16-LABEL: fmul_s16_div:
; GFX11-TRUE16: ; %bb.0:
; GFX11-TRUE16-NEXT: v_mul_f16_e32 v0.l, v0.l, v1.l
; GFX11-TRUE16-NEXT: ; return to shader part epilog
;
; GFX12-FAKE16-LABEL: fmul_s16_div:
; GFX12-FAKE16: ; %bb.0:
; GFX12-FAKE16-NEXT: v_mul_f16_e32 v0, v0, v1
; GFX12-FAKE16-NEXT: ; return to shader part epilog
;
; GFX12-TRUE16-LABEL: fmul_s16_div:
; GFX12-TRUE16: ; %bb.0:
; GFX12-TRUE16-NEXT: v_mul_f16_e32 v0.l, v0.l, v1.l
; GFX12-TRUE16-NEXT: ; return to shader part epilog
%result = fmul half %a, %b
ret half %result
}

define amdgpu_ps float @fmul_s32_uniform(float inreg %a, float inreg %b) {
; GFX11-LABEL: fmul_s32_uniform:
; GFX11: ; %bb.0:
; GFX11-NEXT: v_mul_f32_e64 v0, s0, s1
; GFX11-NEXT: ; return to shader part epilog
;
; GFX12-LABEL: fmul_s32_uniform:
; GFX12: ; %bb.0:
; GFX12-NEXT: s_mul_f32 s0, s0, s1
; GFX12-NEXT: s_delay_alu instid0(SALU_CYCLE_3)
; GFX12-NEXT: v_mov_b32_e32 v0, s0
; GFX12-NEXT: ; return to shader part epilog
%result = fmul float %a, %b
ret float %result
}

define amdgpu_ps float @fmul_s32_div(float %a, float %b) {
; GCN-LABEL: fmul_s32_div:
; GCN: ; %bb.0:
; GCN-NEXT: v_mul_f32_e32 v0, v0, v1
; GCN-NEXT: ; return to shader part epilog
%result = fmul float %a, %b
ret float %result
}

define amdgpu_ps void @fmul_s64_uniform(double inreg %a, double inreg %b, ptr addrspace(1) %ptr) {
; GFX11-LABEL: fmul_s64_uniform:
; GFX11: ; %bb.0:
; GFX11-NEXT: v_mul_f64 v[2:3], s[0:1], s[2:3]
; GFX11-NEXT: global_store_b64 v[0:1], v[2:3], off
; GFX11-NEXT: s_endpgm
;
; GFX12-LABEL: fmul_s64_uniform:
; GFX12: ; %bb.0:
; GFX12-NEXT: v_mul_f64_e64 v[2:3], s[0:1], s[2:3]
; GFX12-NEXT: global_store_b64 v[0:1], v[2:3], off
; GFX12-NEXT: s_endpgm
%result = fmul double %a, %b
store double %result, ptr addrspace(1) %ptr
ret void
}

define amdgpu_ps void @fmul_s64_div(double %a, double %b, ptr addrspace(1) %ptr) {
; GFX11-LABEL: fmul_s64_div:
; GFX11: ; %bb.0:
; GFX11-NEXT: v_mul_f64 v[0:1], v[0:1], v[2:3]
; GFX11-NEXT: global_store_b64 v[4:5], v[0:1], off
; GFX11-NEXT: s_endpgm
;
; GFX12-LABEL: fmul_s64_div:
; GFX12: ; %bb.0:
; GFX12-NEXT: v_mul_f64_e32 v[0:1], v[0:1], v[2:3]
; GFX12-NEXT: global_store_b64 v[4:5], v[0:1], off
; GFX12-NEXT: s_endpgm
%result = fmul double %a, %b
store double %result, ptr addrspace(1) %ptr
ret void
}

define amdgpu_ps <2 x half> @fmul_v2s16_uniform(<2 x half> inreg %a, <2 x half> inreg %b) {
; GFX11-LABEL: fmul_v2s16_uniform:
; GFX11: ; %bb.0:
; GFX11-NEXT: v_pk_mul_f16 v0, s0, s1
; GFX11-NEXT: ; return to shader part epilog
;
; GFX12-LABEL: fmul_v2s16_uniform:
; GFX12: ; %bb.0:
; GFX12-NEXT: s_lshr_b32 s2, s0, 16
; GFX12-NEXT: s_lshr_b32 s3, s1, 16
; GFX12-NEXT: s_mul_f16 s0, s0, s1
; GFX12-NEXT: s_mul_f16 s1, s2, s3
; GFX12-NEXT: s_delay_alu instid0(SALU_CYCLE_3) | instskip(NEXT) | instid1(SALU_CYCLE_1)
; GFX12-NEXT: s_pack_ll_b32_b16 s0, s0, s1
; GFX12-NEXT: v_mov_b32_e32 v0, s0
; GFX12-NEXT: ; return to shader part epilog
%result = fmul <2 x half> %a, %b
ret <2 x half> %result
}

define amdgpu_ps <2 x half> @fmul_v2s16_div(<2 x half> %a, <2 x half> %b) {
; GCN-LABEL: fmul_v2s16_div:
; GCN: ; %bb.0:
; GCN-NEXT: v_pk_mul_f16 v0, v0, v1
; GCN-NEXT: ; return to shader part epilog
%result = fmul <2 x half> %a, %b
ret <2 x half> %result
}

define amdgpu_ps <2 x float> @fmul_v2s32_uniform(<2 x float> inreg %a, <2 x float> inreg %b) {
; GFX11-LABEL: fmul_v2s32_uniform:
; GFX11: ; %bb.0:
; GFX11-NEXT: v_mul_f32_e64 v0, s0, s2
; GFX11-NEXT: v_mul_f32_e64 v1, s1, s3
; GFX11-NEXT: ; return to shader part epilog
;
; GFX12-LABEL: fmul_v2s32_uniform:
; GFX12: ; %bb.0:
; GFX12-NEXT: s_mul_f32 s0, s0, s2
; GFX12-NEXT: s_mul_f32 s1, s1, s3
; GFX12-NEXT: s_delay_alu instid0(SALU_CYCLE_3)
; GFX12-NEXT: v_dual_mov_b32 v0, s0 :: v_dual_mov_b32 v1, s1
; GFX12-NEXT: ; return to shader part epilog
%result = fmul <2 x float> %a, %b
ret <2 x float> %result
}

define amdgpu_ps <2 x float> @fmul_v2s32_div(<2 x float> %a, <2 x float> %b) {
; GCN-LABEL: fmul_v2s32_div:
; GCN: ; %bb.0:
; GCN-NEXT: v_dual_mul_f32 v0, v0, v2 :: v_dual_mul_f32 v1, v1, v3
; GCN-NEXT: ; return to shader part epilog
%result = fmul <2 x float> %a, %b
ret <2 x float> %result
}
2 changes: 2 additions & 0 deletions llvm/test/CodeGen/AMDGPU/GlobalISel/fmul.v2f16.ll
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
; RUN: llc -global-isel -mtriple=amdgcn-amd-amdhsa -mcpu=gfx1010 < %s | FileCheck -check-prefix=GFX10 %s
; RUN: llc -global-isel -mtriple=amdgcn-amd-amdhsa -mcpu=gfx1100 -amdgpu-enable-delay-alu=0 < %s | FileCheck -check-prefix=GFX10 %s

; TODO: Switch test to use -new-reg-bank-select after adding G_FNEG support.

define <2 x half> @v_fmul_v2f16(<2 x half> %a, <2 x half> %b) {
; GFX9-LABEL: v_fmul_v2f16:
; GFX9: ; %bb.0:
Expand Down
5 changes: 3 additions & 2 deletions llvm/test/CodeGen/AMDGPU/GlobalISel/regbankselect-fmul.mir
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py
# RUN: llc -mtriple=amdgcn -mcpu=fiji -run-pass=regbankselect %s -verify-machineinstrs -o - -regbankselect-fast | FileCheck %s
# RUN: llc -mtriple=amdgcn -mcpu=fiji -run-pass=regbankselect %s -verify-machineinstrs -o - -regbankselect-greedy | FileCheck %s
# RUN: llc -mtriple=amdgcn -mcpu=fiji -run-pass="amdgpu-regbankselect,amdgpu-regbanklegalize" %s -verify-machineinstrs -o - -regbankselect-fast | FileCheck %s
# RUN: llc -mtriple=amdgcn -mcpu=fiji -run-pass="amdgpu-regbankselect,amdgpu-regbanklegalize" %s -verify-machineinstrs -o - -regbankselect-greedy | FileCheck %s

---
name: fmul_ss
Expand All @@ -17,6 +17,7 @@ body: |
; CHECK-NEXT: [[COPY2:%[0-9]+]]:vgpr(s32) = COPY [[COPY]](s32)
; CHECK-NEXT: [[COPY3:%[0-9]+]]:vgpr(s32) = COPY [[COPY1]](s32)
; CHECK-NEXT: [[FMUL:%[0-9]+]]:vgpr(s32) = G_FMUL [[COPY2]], [[COPY3]]
; CHECK-NEXT: [[AMDGPU_READANYLANE:%[0-9]+]]:sgpr(s32) = G_AMDGPU_READANYLANE [[FMUL]]
%0:_(s32) = COPY $sgpr0
%1:_(s32) = COPY $sgpr1
%2:_(s32) = G_FMUL %0, %1
Expand Down
Loading