Skip to content

Commit d8285df

Browse files
[AMDGPU][NFC] Reduce diff between downstream branch (#155779)
1 parent abfe556 commit d8285df

File tree

4 files changed

+22
-22
lines changed

4 files changed

+22
-22
lines changed

llvm/lib/Target/AMDGPU/AMDGPUMachineModuleInfo.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@ class AMDGPUMachineModuleInfo final : public MachineModuleInfoELF {
7474
/// otherwise
7575
bool isOneAddressSpace(SyncScope::ID SSID) const {
7676
return SSID == getSingleThreadOneAddressSpaceSSID() ||
77-
SSID == getWavefrontOneAddressSpaceSSID() ||
78-
SSID == getWorkgroupOneAddressSpaceSSID() ||
79-
SSID == getAgentOneAddressSpaceSSID() ||
80-
SSID == getSystemOneAddressSpaceSSID();
77+
SSID == getWavefrontOneAddressSpaceSSID() ||
78+
SSID == getWorkgroupOneAddressSpaceSSID() ||
79+
SSID == getAgentOneAddressSpaceSSID() ||
80+
SSID == getSystemOneAddressSpaceSSID();
8181
}
8282

8383
public:

llvm/lib/Target/AMDGPU/SIISelLowering.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
#ifndef LLVM_LIB_TARGET_AMDGPU_SIISELLOWERING_H
1515
#define LLVM_LIB_TARGET_AMDGPU_SIISELLOWERING_H
1616

17-
#include "AMDGPUISelLowering.h"
1817
#include "AMDGPUArgumentUsageInfo.h"
18+
#include "AMDGPUISelLowering.h"
1919
#include "llvm/CodeGen/MachineFunction.h"
2020

2121
namespace llvm {

llvm/lib/Target/AMDGPU/SIInstrInfo.td

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1806,15 +1806,15 @@ class getVALUDstForVT<ValueType VT, bit IsTrue16 = 0, bit IsVOP3Encoding = 0> {
18061806
VOPDstOperand_t16Lo128),
18071807
VOPDstOperand<VGPR_32>);
18081808
RegisterOperand ret = !cond(!eq(VT.Size, 1024) : VOPDstOperand<VReg_1024>,
1809-
!eq(VT.Size, 512) : VOPDstOperand<VReg_512>,
1810-
!eq(VT.Size, 256) : VOPDstOperand<VReg_256>,
1811-
!eq(VT.Size, 192) : VOPDstOperand<VReg_192>,
1812-
!eq(VT.Size, 128) : VOPDstOperand<VReg_128>,
1809+
!eq(VT.Size, 512) : VOPDstOperand<VReg_512>,
1810+
!eq(VT.Size, 256) : VOPDstOperand<VReg_256>,
1811+
!eq(VT.Size, 192) : VOPDstOperand<VReg_192>,
1812+
!eq(VT.Size, 128) : VOPDstOperand<VReg_128>,
18131813
!eq(VT.Size, 96) : VOPDstOperand<VReg_96>,
1814-
!eq(VT.Size, 64) : VOPDstOperand<VReg_64>,
1815-
!eq(VT.Size, 32) : VOPDstOperand<VGPR_32>,
1816-
!eq(VT.Size, 16) : op16,
1817-
1 : VOPDstS64orS32); // else VT == i1
1814+
!eq(VT.Size, 64) : VOPDstOperand<VReg_64>,
1815+
!eq(VT.Size, 32) : VOPDstOperand<VGPR_32>,
1816+
!eq(VT.Size, 16) : op16,
1817+
1 : VOPDstS64orS32); // else VT == i1
18181818
}
18191819

18201820
class getVALUDstForVT_fake16<ValueType VT> {

llvm/lib/Target/AMDGPU/SIRegisterInfo.td

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1249,15 +1249,15 @@ class SrcReg9<RegisterClass regClass> : RegisterOperand<regClass> {
12491249
let DecoderMethod = "decodeSrcReg9<" # regClass.Size # ">";
12501250
}
12511251

1252-
def VRegSrc_32 : SrcReg9<VGPR_32>;
1253-
def VRegSrc_64 : SrcReg9<VReg_64>;
1254-
def VRegSrc_96 : SrcReg9<VReg_96>;
1255-
def VRegSrc_128: SrcReg9<VReg_128>;
1256-
def VRegSrc_192: SrcReg9<VReg_192>;
1257-
def VRegSrc_256: SrcReg9<VReg_256>;
1258-
def VRegSrc_384: SrcReg9<VReg_384>;
1259-
def VRegSrc_512: SrcReg9<VReg_512>;
1260-
def VRegSrc_1024: SrcReg9<VReg_1024>;
1252+
def VRegSrc_32 : SrcReg9<VGPR_32>;
1253+
def VRegSrc_64 : SrcReg9<VReg_64>;
1254+
def VRegSrc_96 : SrcReg9<VReg_96>;
1255+
def VRegSrc_128 : SrcReg9<VReg_128>;
1256+
def VRegSrc_192 : SrcReg9<VReg_192>;
1257+
def VRegSrc_256 : SrcReg9<VReg_256>;
1258+
def VRegSrc_384 : SrcReg9<VReg_384>;
1259+
def VRegSrc_512 : SrcReg9<VReg_512>;
1260+
def VRegSrc_1024 : SrcReg9<VReg_1024>;
12611261
def VRegOrLdsSrc_32 : SrcReg9<VRegOrLds_32>;
12621262

12631263
// True 16 Operands

0 commit comments

Comments
 (0)