@@ -815,7 +815,7 @@ void SIInstrInfo::copyPhysReg(MachineBasicBlock &MBB,
815
815
if (Fix16BitCopies) {
816
816
if (((Size == 16) != (SrcSize == 16))) {
817
817
// Non-VGPR Src and Dst will later be expanded back to 32 bits.
818
- assert(ST.hasTrue16BitInsts ());
818
+ assert(ST.useRealTrue16Insts ());
819
819
Register &RegToFix = (Size == 32) ? DestReg : SrcReg;
820
820
MCRegister SubReg = RI.getSubReg(RegToFix, AMDGPU::lo16);
821
821
RegToFix = SubReg;
@@ -989,7 +989,7 @@ void SIInstrInfo::copyPhysReg(MachineBasicBlock &MBB,
989
989
return;
990
990
}
991
991
992
- if (ST.hasTrue16BitInsts ()) {
992
+ if (ST.useRealTrue16Insts ()) {
993
993
if (IsSGPRSrc) {
994
994
assert(SrcLow);
995
995
SrcReg = NewSrcReg;
@@ -5581,27 +5581,39 @@ unsigned SIInstrInfo::getVALUOp(const MachineInstr &MI) const {
5581
5581
return ST.useRealTrue16Insts() ? AMDGPU::V_FLOOR_F16_t16_e64
5582
5582
: AMDGPU::V_FLOOR_F16_fake16_e64;
5583
5583
case AMDGPU::S_TRUNC_F16:
5584
- return AMDGPU::V_TRUNC_F16_fake16_e64;
5584
+ return ST.useRealTrue16Insts() ? AMDGPU::V_TRUNC_F16_t16_e64
5585
+ : AMDGPU::V_TRUNC_F16_fake16_e64;
5585
5586
case AMDGPU::S_RNDNE_F16:
5586
- return AMDGPU::V_RNDNE_F16_fake16_e64;
5587
+ return ST.useRealTrue16Insts() ? AMDGPU::V_RNDNE_F16_t16_e64
5588
+ : AMDGPU::V_RNDNE_F16_fake16_e64;
5587
5589
case AMDGPU::S_ADD_F32: return AMDGPU::V_ADD_F32_e64;
5588
5590
case AMDGPU::S_SUB_F32: return AMDGPU::V_SUB_F32_e64;
5589
5591
case AMDGPU::S_MIN_F32: return AMDGPU::V_MIN_F32_e64;
5590
5592
case AMDGPU::S_MAX_F32: return AMDGPU::V_MAX_F32_e64;
5591
5593
case AMDGPU::S_MINIMUM_F32: return AMDGPU::V_MINIMUM_F32_e64;
5592
5594
case AMDGPU::S_MAXIMUM_F32: return AMDGPU::V_MAXIMUM_F32_e64;
5593
5595
case AMDGPU::S_MUL_F32: return AMDGPU::V_MUL_F32_e64;
5594
- case AMDGPU::S_ADD_F16: return AMDGPU::V_ADD_F16_fake16_e64;
5595
- case AMDGPU::S_SUB_F16: return AMDGPU::V_SUB_F16_fake16_e64;
5596
- case AMDGPU::S_MIN_F16: return AMDGPU::V_MIN_F16_fake16_e64;
5597
- case AMDGPU::S_MAX_F16: return AMDGPU::V_MAX_F16_fake16_e64;
5596
+ case AMDGPU::S_ADD_F16:
5597
+ return ST.useRealTrue16Insts() ? AMDGPU::V_ADD_F16_t16_e64
5598
+ : AMDGPU::V_ADD_F16_fake16_e64;
5599
+ case AMDGPU::S_SUB_F16:
5600
+ return ST.useRealTrue16Insts() ? AMDGPU::V_SUB_F16_t16_e64
5601
+ : AMDGPU::V_SUB_F16_fake16_e64;
5602
+ case AMDGPU::S_MIN_F16:
5603
+ return ST.useRealTrue16Insts() ? AMDGPU::V_MIN_F16_t16_e64
5604
+ : AMDGPU::V_MIN_F16_fake16_e64;
5605
+ case AMDGPU::S_MAX_F16:
5606
+ return ST.useRealTrue16Insts() ? AMDGPU::V_MAX_F16_t16_e64
5607
+ : AMDGPU::V_MAX_F16_fake16_e64;
5598
5608
case AMDGPU::S_MINIMUM_F16:
5599
5609
return ST.useRealTrue16Insts() ? AMDGPU::V_MINIMUM_F16_t16_e64
5600
5610
: AMDGPU::V_MINIMUM_F16_fake16_e64;
5601
5611
case AMDGPU::S_MAXIMUM_F16:
5602
5612
return ST.useRealTrue16Insts() ? AMDGPU::V_MAXIMUM_F16_t16_e64
5603
5613
: AMDGPU::V_MAXIMUM_F16_fake16_e64;
5604
- case AMDGPU::S_MUL_F16: return AMDGPU::V_MUL_F16_fake16_e64;
5614
+ case AMDGPU::S_MUL_F16:
5615
+ return ST.useRealTrue16Insts() ? AMDGPU::V_MUL_F16_t16_e64
5616
+ : AMDGPU::V_MUL_F16_fake16_e64;
5605
5617
case AMDGPU::S_CVT_PK_RTZ_F16_F32: return AMDGPU::V_CVT_PKRTZ_F16_F32_e64;
5606
5618
case AMDGPU::S_FMAC_F32: return AMDGPU::V_FMAC_F32_e64;
5607
5619
case AMDGPU::S_FMAC_F16:
@@ -5666,15 +5678,25 @@ unsigned SIInstrInfo::getVALUOp(const MachineInstr &MI) const {
5666
5678
return ST.useRealTrue16Insts() ? AMDGPU::V_CMP_NLT_F16_t16_e64
5667
5679
: AMDGPU::V_CMP_NLT_F16_fake16_e64;
5668
5680
case AMDGPU::V_S_EXP_F32_e64: return AMDGPU::V_EXP_F32_e64;
5669
- case AMDGPU::V_S_EXP_F16_e64: return AMDGPU::V_EXP_F16_fake16_e64;
5681
+ case AMDGPU::V_S_EXP_F16_e64:
5682
+ return ST.useRealTrue16Insts() ? AMDGPU::V_EXP_F16_t16_e64
5683
+ : AMDGPU::V_EXP_F16_fake16_e64;
5670
5684
case AMDGPU::V_S_LOG_F32_e64: return AMDGPU::V_LOG_F32_e64;
5671
- case AMDGPU::V_S_LOG_F16_e64: return AMDGPU::V_LOG_F16_fake16_e64;
5685
+ case AMDGPU::V_S_LOG_F16_e64:
5686
+ return ST.useRealTrue16Insts() ? AMDGPU::V_LOG_F16_t16_e64
5687
+ : AMDGPU::V_LOG_F16_fake16_e64;
5672
5688
case AMDGPU::V_S_RCP_F32_e64: return AMDGPU::V_RCP_F32_e64;
5673
- case AMDGPU::V_S_RCP_F16_e64: return AMDGPU::V_RCP_F16_fake16_e64;
5689
+ case AMDGPU::V_S_RCP_F16_e64:
5690
+ return ST.useRealTrue16Insts() ? AMDGPU::V_RCP_F16_t16_e64
5691
+ : AMDGPU::V_RCP_F16_fake16_e64;
5674
5692
case AMDGPU::V_S_RSQ_F32_e64: return AMDGPU::V_RSQ_F32_e64;
5675
- case AMDGPU::V_S_RSQ_F16_e64: return AMDGPU::V_RSQ_F16_fake16_e64;
5693
+ case AMDGPU::V_S_RSQ_F16_e64:
5694
+ return ST.useRealTrue16Insts() ? AMDGPU::V_RSQ_F16_t16_e64
5695
+ : AMDGPU::V_RSQ_F16_fake16_e64;
5676
5696
case AMDGPU::V_S_SQRT_F32_e64: return AMDGPU::V_SQRT_F32_e64;
5677
- case AMDGPU::V_S_SQRT_F16_e64: return AMDGPU::V_SQRT_F16_fake16_e64;
5697
+ case AMDGPU::V_S_SQRT_F16_e64:
5698
+ return ST.useRealTrue16Insts() ? AMDGPU::V_SQRT_F16_t16_e64
5699
+ : AMDGPU::V_SQRT_F16_fake16_e64;
5678
5700
}
5679
5701
llvm_unreachable(
5680
5702
"Unexpected scalar opcode without corresponding vector one!");
0 commit comments