6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-01-03 13:31:05 +00:00
Code Issues Projects Releases Wiki Activity

Fix PR11370 for real. Prevents converting 256-bit FP instruction to AVX2 256-bit integer instructions when AVX2 isn't enabled.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@144629 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Craig Topper 2011-11-15 06:39:01 +00:00
parent f178418729
commit 44ec9fddc2
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/Target/X86/X86InstrInfo.cpp
View File

@ -3573,14 +3573,17 @@ static const unsigned ReplaceableInstrsAVX2[][3] = {
// FIXME: Some shuffle and unpack instructions have equivalents in different // FIXME: Some shuffle and unpack instructions have equivalents in different
// domains, but they require a bit more work than just switching opcodes. // domains, but they require a bit more work than just switching opcodes.
static const unsigned *lookup(unsigned opcode, unsigned domain, bool hasAVX2) { static const unsigned *lookup(unsigned opcode, unsigned domain) {
for (unsigned i = 0, e = array_lengthof(ReplaceableInstrs); i != e; ++i) for (unsigned i = 0, e = array_lengthof(ReplaceableInstrs); i != e; ++i)
if (ReplaceableInstrs[i][domain-1] == opcode) if (ReplaceableInstrs[i][domain-1] == opcode)
return ReplaceableInstrs[i]; return ReplaceableInstrs[i];
if (domain != 3 || hasAVX2) // only use PackedInt domain if AVX2 is enabled return 0;
for (unsigned i = 0, e = array_lengthof(ReplaceableInstrsAVX2); i != e; ++i) }
if (ReplaceableInstrsAVX2[i][domain-1] == opcode)
return ReplaceableInstrsAVX2[i]; static const unsigned *lookupAVX2(unsigned opcode, unsigned domain) {
for (unsigned i = 0, e = array_lengthof(ReplaceableInstrsAVX2); i != e; ++i)
if (ReplaceableInstrsAVX2[i][domain-1] == opcode)
return ReplaceableInstrsAVX2[i];
return 0; return 0;
} }
@ -3588,16 +3591,21 @@ std::pair<uint16_t, uint16_t>
X86InstrInfo::getExecutionDomain(const MachineInstr *MI) const { X86InstrInfo::getExecutionDomain(const MachineInstr *MI) const {
uint16_t domain = (MI->getDesc().TSFlags >> X86II::SSEDomainShift) & 3; uint16_t domain = (MI->getDesc().TSFlags >> X86II::SSEDomainShift) & 3;
bool hasAVX2 = TM.getSubtarget<X86Subtarget>().hasAVX2(); bool hasAVX2 = TM.getSubtarget<X86Subtarget>().hasAVX2();
return std::make_pair(domain, uint16_t validDomains = 0;
domain && lookup(MI->getOpcode(), domain, hasAVX2) ? 0xe : 0); if (domain && lookup(MI->getOpcode(), domain))
validDomains = 0xe;
else if (domain && lookupAVX2(MI->getOpcode(), domain))
validDomains = hasAVX2 ? 0xe : 0x6;
return std::make_pair(domain, validDomains);
} }
void X86InstrInfo::setExecutionDomain(MachineInstr *MI, unsigned Domain) const { void X86InstrInfo::setExecutionDomain(MachineInstr *MI, unsigned Domain) const {
assert(Domain>0 && Domain<4 && "Invalid execution domain"); assert(Domain>0 && Domain<4 && "Invalid execution domain");
uint16_t dom = (MI->getDesc().TSFlags >> X86II::SSEDomainShift) & 3; uint16_t dom = (MI->getDesc().TSFlags >> X86II::SSEDomainShift) & 3;
assert(dom && "Not an SSE instruction"); assert(dom && "Not an SSE instruction");
bool hasAVX2 = TM.getSubtarget<X86Subtarget>().hasAVX2(); const unsigned *table = lookup(MI->getOpcode(), dom);
const unsigned *table = lookup(MI->getOpcode(), dom, hasAVX2); if (!table) // try the other table
table = lookupAVX2(MI->getOpcode(), dom);
assert(table && "Cannot change domain"); assert(table && "Cannot change domain");
MI->setDesc(get(table[Domain-1])); MI->setDesc(get(table[Domain-1]));
} }