From dd3604df31aa22a1b9e365bdb22f445c7c0f21ae Mon Sep 17 00:00:00 2001 From: Matt Arsenault Date: Fri, 10 Feb 2017 02:42:31 +0000 Subject: [PATCH] AMDGPU: Fix trailing whitespace git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@294694 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.cpp | 2 +- lib/Target/AMDGPU/SIISelLowering.cpp | 11 +++++------ lib/Target/AMDGPU/VOP1Instructions.td | 2 +- lib/Target/AMDGPU/VOP2Instructions.td | 6 +++--- lib/Target/AMDGPU/VOPInstructions.td | 6 +++--- 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/lib/Target/AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.cpp b/lib/Target/AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.cpp index edeb485518d..5935c6a49f0 100644 --- a/lib/Target/AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.cpp +++ b/lib/Target/AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.cpp @@ -160,7 +160,7 @@ AMDGPUTargetELFStreamer::EmitDirectiveHSACodeObjectISA(uint32_t Major, StringRef ArchName) { uint16_t VendorNameSize = VendorName.size() + 1; uint16_t ArchNameSize = ArchName.size() + 1; - + unsigned DescSZ = sizeof(VendorNameSize) + sizeof(ArchNameSize) + sizeof(Major) + sizeof(Minor) + sizeof(Stepping) + VendorNameSize + ArchNameSize; diff --git a/lib/Target/AMDGPU/SIISelLowering.cpp b/lib/Target/AMDGPU/SIISelLowering.cpp index ba3a6232212..5c8aee79fdb 100644 --- a/lib/Target/AMDGPU/SIISelLowering.cpp +++ b/lib/Target/AMDGPU/SIISelLowering.cpp @@ -1782,7 +1782,7 @@ MachineBasicBlock *SITargetLowering::EmitInstrWithCustomInserter( switch (MI.getOpcode()) { case AMDGPU::S_TRAP_PSEUDO: { const DebugLoc &DL = MI.getDebugLoc(); - const int TrapType = MI.getOperand(0).getImm(); + const int TrapType = MI.getOperand(0).getImm(); if (Subtarget->getTrapHandlerAbi() == SISubtarget::TrapHandlerAbiHsa && Subtarget->isTrapHandlerEnabled()) { @@ -1798,11 +1798,11 @@ MachineBasicBlock *SITargetLowering::EmitInstrWithCustomInserter( BuildMI(*BB, MI, DL, TII->get(AMDGPU::COPY), AMDGPU::SGPR0_SGPR1) .addReg(UserSGPR); BuildMI(*BB, MI, DL, TII->get(AMDGPU::S_TRAP)) - .addImm(TrapType) + .addImm(TrapType) .addReg(AMDGPU::SGPR0_SGPR1, RegState::Implicit); } else { - switch (TrapType) { - case SISubtarget::TrapCodeLLVMTrap: + switch (TrapType) { + case SISubtarget::TrapCodeLLVMTrap: BuildMI(*BB, MI, DL, TII->get(AMDGPU::S_ENDPGM)); break; case SISubtarget::TrapCodeLLVMDebugTrap: { @@ -1810,7 +1810,7 @@ MachineBasicBlock *SITargetLowering::EmitInstrWithCustomInserter( "debugtrap handler not supported", DL, DS_Warning); - LLVMContext &C = MF->getFunction()->getContext(); + LLVMContext &C = MF->getFunction()->getContext(); C.diagnose(NoTrap); BuildMI(*BB, MI, DL, TII->get(AMDGPU::S_NOP)) .addImm(0); @@ -1824,7 +1824,6 @@ MachineBasicBlock *SITargetLowering::EmitInstrWithCustomInserter( MI.eraseFromParent(); return BB; } - case AMDGPU::SI_INIT_M0: BuildMI(*BB, MI.getIterator(), MI.getDebugLoc(), TII->get(AMDGPU::S_MOV_B32), AMDGPU::M0) diff --git a/lib/Target/AMDGPU/VOP1Instructions.td b/lib/Target/AMDGPU/VOP1Instructions.td index 15abed4a76b..c023dfec792 100644 --- a/lib/Target/AMDGPU/VOP1Instructions.td +++ b/lib/Target/AMDGPU/VOP1Instructions.td @@ -23,7 +23,7 @@ class VOP1e op, VOPProfile P> : Enc32 { class VOP1_SDWAe op, VOPProfile P> : VOP_SDWAe

{ bits<8> vdst; - + let Inst{8-0} = 0xf9; // sdwa let Inst{16-9} = op; let Inst{24-17} = !if(P.EmitDst, vdst{7-0}, 0); diff --git a/lib/Target/AMDGPU/VOP2Instructions.td b/lib/Target/AMDGPU/VOP2Instructions.td index cd5f044ecd5..01075c3a0b7 100644 --- a/lib/Target/AMDGPU/VOP2Instructions.td +++ b/lib/Target/AMDGPU/VOP2Instructions.td @@ -40,7 +40,7 @@ class VOP2_MADKe op, VOPProfile P> : Enc64 { class VOP2_SDWAe op, VOPProfile P> : VOP_SDWAe

{ bits<8> vdst; bits<8> src1; - + let Inst{8-0} = 0xf9; // sdwa let Inst{16-9} = !if(P.HasSrc1, src1{7-0}, 0); let Inst{24-17} = !if(P.EmitDst, vdst{7-0}, 0); @@ -133,7 +133,7 @@ multiclass VOP2bInst , Commutable_REV; - + def _sdwa : VOP2_SDWA_Pseudo ; } @@ -654,7 +654,7 @@ multiclass Base_VOP2_Real_e32e64_vi op> : VOP2_Real_e64_vi<{0, 1, 0, 0, op{5-0}}>; } // End AssemblerPredicates = [isVI], DecoderNamespace = "VI" - + multiclass VOP2_SDWA_Real op> { def _sdwa_vi : VOP_SDWA_Real (NAME#"_sdwa")>, diff --git a/lib/Target/AMDGPU/VOPInstructions.td b/lib/Target/AMDGPU/VOPInstructions.td index 184c5bc9bb5..ebc01ffc3af 100644 --- a/lib/Target/AMDGPU/VOPInstructions.td +++ b/lib/Target/AMDGPU/VOPInstructions.td @@ -250,7 +250,7 @@ class VOP_SDWA_Pseudo pattern=[]> : VOP , SIMCInstr , MnemonicAlias { - + let isPseudo = 1; let isCodeGenOnly = 1; let UseNamedOperandTable = 1; @@ -261,12 +261,12 @@ class VOP_SDWA_Pseudo pattern=[]> : let Size = 8; let mayLoad = 0; let mayStore = 0; - let hasSideEffects = 0; + let hasSideEffects = 0; let VALU = 1; let SDWA = 1; let Uses = [EXEC]; - + let SubtargetPredicate = HasSDWA; let AssemblerPredicate = !if(P.HasExt, HasSDWA, DisableInst); let AsmVariantName = !if(P.HasExt, AMDGPUAsmVariants.SDWA, -- 2.50.1