Chromium Code Reviews| Index: src/IceInstARM32.cpp |
| diff --git a/src/IceInstARM32.cpp b/src/IceInstARM32.cpp |
| index 93bbb2769b2db2e1e7027c614765415e557e2856..65565800ef5175165431fc3fc21387370adf56c8 100644 |
| --- a/src/IceInstARM32.cpp |
| +++ b/src/IceInstARM32.cpp |
| @@ -20,7 +20,6 @@ |
| #include "IceCfgNode.h" |
| #include "IceInst.h" |
| #include "IceOperand.h" |
| -#include "IceRegistersARM32.h" |
| #include "IceTargetLoweringARM32.h" |
| namespace Ice { |
| @@ -28,6 +27,8 @@ namespace ARM32 { |
| namespace { |
| +using Register = RegARM32::AllRegisters; |
| + |
| // maximum number of registers allowed in vpush/vpop. |
| static constexpr SizeT VpushVpopMaxConsecRegs = 16; |
| @@ -981,6 +982,133 @@ InstARM32Mov::InstARM32Mov(Cfg *Func, Variable *Dest, Operand *Src, |
| } |
| } |
| +// These next two functions find the D register that maps to the half of the Q |
| +// register that this instruction is accessing. |
| +Register getDRegister(const Variable *Src, uint32_t Index) { |
| + assert(Src->hasReg()); |
| + const auto SrcReg = (Register)Src->getRegNum(); |
| + |
| + const RegARM32::RegTableType &SrcEntry = RegARM32::RegTable[SrcReg]; |
| + assert(SrcEntry.IsVec128); |
| + |
| + const uint32_t NumElements = typeNumElements(Src->getType()); |
| + |
| + // This code assumes the Aliases list goes Q_n, S_2n, S_2n+1. The asserts in |
| + // the next two branches help to check that this is still true. |
| + if (Index < NumElements / 2) { |
| + // We have a Q register that's made up of two D registers. This assert is |
| + // to help ensure that we picked the right D register. |
| + // |
| + // TODO(jpp): find a way to do this that doesn't rely on ordering of the |
| + // alias list. |
| + assert(RegARM32::RegTable[SrcEntry.Aliases[1]].Encoding + 1 == |
| + RegARM32::RegTable[SrcEntry.Aliases[2]].Encoding); |
| + return (Register)SrcEntry.Aliases[1]; |
| + } else { |
| + // We have a Q register that's made up of two D registers. This assert is |
| + // to help ensure that we picked the right D register. |
| + // |
| + // TODO(jpp): find a way to do this that doesn't rely on ordering of the |
| + // alias list. |
| + assert(RegARM32::RegTable[SrcEntry.Aliases[2]].Encoding - 1 == |
| + RegARM32::RegTable[SrcEntry.Aliases[1]].Encoding); |
| + return (Register)SrcEntry.Aliases[2]; |
| + } |
| +} |
| + |
| +constexpr uint32_t getDIndex(uint32_t NumElements, uint32_t Index) { |
| + return (Index < NumElements / 2) ? Index : Index - (NumElements / 2); |
| +} |
| + |
| +// For floating point values, we can insertelement or extractelement by moving |
| +// directly from an S register. This function finds the right one. |
| +Register getSRegister(const Variable *Src, uint32_t Index) { |
| + assert(Src->hasReg()); |
| + auto SrcReg = Src->getRegNum(); |
| + |
| + // For floating point values, we need to be allocated to Q0 - Q7, so we can |
| + // directly access the value we want as one of the S registers. |
| + assert(Src->getType() == IceType_v4f32 && SrcReg < RegARM32::Reg_q8); |
| + |
| + // This part assumes the register alias list is goes q0, d0, d1, s0, s1, s2, |
|
Jim Stichnoth
2016/02/08 18:08:29
"is goes" - drop one of those word, I think.
Eric Holk
2016/02/08 18:44:10
Done.
|
| + // s3. |
| + assert(Index < 4); |
| + |
| + // TODO(jpp): find a way to do this that doesn't rely on ordering of the alias |
| + // list. |
| + return (Register)RegARM32::RegTable[SrcReg].Aliases[Index + 3]; |
| +} |
| + |
| +void InstARM32Extract::emit(const Cfg *Func) const { |
| + auto &Str = Func->getContext()->getStrEmit(); |
| + auto DestTy = getDest()->getType(); |
| + |
| + auto *Src = llvm::dyn_cast<Variable>(getSrc(0)); |
|
Jim Stichnoth
2016/02/08 18:08:29
llvm::cast<>
Eric Holk
2016/02/08 18:44:10
Done.
|
| + |
| + if (isIntegerType(DestTy)) { |
| + Str << "\t" |
| + << "vmov" << getPredicate(); |
| + auto BitSize = typeWidthInBytes(DestTy) * CHAR_BIT; |
|
Jim Stichnoth
2016/02/08 18:08:29
I thought even John had a problem with this use of
Eric Holk
2016/02/08 18:44:10
I'll replace it with `const uint32_t`.
|
| + if (BitSize < 32) { |
| + Str << ".s" << BitSize; |
| + } else { |
| + Str << "." << BitSize; |
| + } |
| + Str << "\t"; |
| + getDest()->emit(Func); |
| + Str << ", "; |
| + |
| + auto VectorSize = typeNumElements(Src->getType()); |
| + |
| + auto SrcReg = getDRegister(Src, Index); |
| + |
| + Str << RegARM32::RegTable[SrcReg].Name; |
| + Str << "[" << getDIndex(VectorSize, Index) << "]"; |
| + } else if (isFloatingType(DestTy)) { |
| + const auto SrcReg = getSRegister(Src, Index); |
| + |
| + Str << "\t" |
| + << "vmov" << getPredicate() << ".f32" |
| + << "\t"; |
| + getDest()->emit(Func); |
| + Str << ", " << RegARM32::RegTable[SrcReg].Name; |
| + } else { |
| + assert(false && "Invalid extract type"); |
| + } |
| +} |
| + |
| +void InstARM32Insert::emit(const Cfg *Func) const { |
| + Ostream &Str = Func->getContext()->getStrEmit(); |
| + const Variable *Dest = getDest(); |
| + const Type DestTy = getDest()->getType(); |
| + |
| + assert(llvm::isa<Variable>(getSrc(0))); |
| + const auto *Src = llvm::dyn_cast<Variable>(getSrc(0)); |
|
Jim Stichnoth
2016/02/08 18:08:29
Change this to llvm::cast<> and remove the assert
Eric Holk
2016/02/08 18:44:10
Done.
|
| + |
| + if (isIntegerType(DestTy)) { |
| + Str << "\t" |
| + << "vmov" << getPredicate(); |
| + const auto BitSize = typeWidthInBytes(typeElementType(DestTy)) * CHAR_BIT; |
| + Str << "." << BitSize << "\t"; |
| + |
| + const auto VectorSize = typeNumElements(DestTy); |
| + const auto DestReg = getDRegister(Dest, Index); |
| + const auto Index = getDIndex(VectorSize, this->Index); |
| + Str << RegARM32::RegTable[DestReg].Name; |
| + Str << "[" << Index << "], "; |
| + Src->emit(Func); |
| + } else if (isFloatingType(DestTy)) { |
| + Str << "\t" |
| + << "vmov" << getPredicate() << ".f32" |
| + << "\t"; |
| + const auto DestReg = getSRegister(Dest, Index); |
| + Str << RegARM32::RegTable[DestReg].Name << ", "; |
| + Src->emit(Func); |
| + } else { |
| + assert(false && "Invalid insert type"); |
| + } |
| +} |
| + |
| template <InstARM32::InstKindARM32 K> |
| void InstARM32CmpLike<K>::emitIAS(const Cfg *Func) const { |
| emitUsingTextFixup(Func); |