diff options
| author | Hal Finkel <hfinkel@anl.gov> | 2014-04-14 05:59:09 +0000 |
|---|---|---|
| committer | Hal Finkel <hfinkel@anl.gov> | 2014-04-14 05:59:09 +0000 |
| commit | 1aee811d7183da0982360e04bad2170c9dc0bfd8 (patch) | |
| tree | 9e99d692ae9b94d22a333641cffbe8cac82c7b6d | |
| parent | 17f9c2e35b0f0caa44a7674347886de7c5bd05aa (diff) | |
| download | llvm-1aee811d7183da0982360e04bad2170c9dc0bfd8.tar.gz llvm-1aee811d7183da0982360e04bad2170c9dc0bfd8.tar.bz2 llvm-1aee811d7183da0982360e04bad2170c9dc0bfd8.tar.xz | |
Don't assert in BasicTTI::getMemoryOpCost for non-simple types
BasicTTI::getMemoryOpCost must explicitly check for non-simple types; setting
AllowUnknown=true with TLI->getSimpleValueType is not sufficient because, for
example, non-power-of-two vector types return non-simple EVTs (not MVT::Other).
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@206150 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/CodeGen/BasicTargetTransformInfo.cpp | 14 | ||||
| -rw-r--r-- | test/Analysis/CostModel/PowerPC/load_store.ll | 3 |
2 files changed, 11 insertions, 6 deletions
diff --git a/lib/CodeGen/BasicTargetTransformInfo.cpp b/lib/CodeGen/BasicTargetTransformInfo.cpp index 26bc6218c2..ecb403a4b6 100644 --- a/lib/CodeGen/BasicTargetTransformInfo.cpp +++ b/lib/CodeGen/BasicTargetTransformInfo.cpp @@ -424,12 +424,14 @@ unsigned BasicTTI::getMemoryOpCost(unsigned Opcode, Type *Src, // This is a vector load that legalizes to a larger type than the vector // itself. Unless the corresponding extending load or truncating store is // legal, then this will scalarize. - TargetLowering::LegalizeAction LA; - MVT MemVT = getTLI()->getSimpleValueType(Src, true); - if (Opcode == Instruction::Store) - LA = getTLI()->getTruncStoreAction(LT.second, MemVT); - else - LA = getTLI()->getLoadExtAction(ISD::EXTLOAD, MemVT); + TargetLowering::LegalizeAction LA = TargetLowering::Expand; + EVT MemVT = getTLI()->getValueType(Src, true); + if (MemVT.isSimple() && MemVT != MVT::Other) { + if (Opcode == Instruction::Store) + LA = getTLI()->getTruncStoreAction(LT.second, MemVT.getSimpleVT()); + else + LA = getTLI()->getLoadExtAction(ISD::EXTLOAD, MemVT.getSimpleVT()); + } if (LA != TargetLowering::Legal && LA != TargetLowering::Custom) { // This is a vector load/store for some illegal type that is scalarized. diff --git a/test/Analysis/CostModel/PowerPC/load_store.ll b/test/Analysis/CostModel/PowerPC/load_store.ll index 40862780fa..368f0a7348 100644 --- a/test/Analysis/CostModel/PowerPC/load_store.ll +++ b/test/Analysis/CostModel/PowerPC/load_store.ll @@ -37,6 +37,9 @@ define i32 @loads(i32 %arg) { ; CHECK: cost of 1 {{.*}} load load <4 x i32>* undef, align 4 + ; CHECK: cost of 46 {{.*}} load + load <3 x float>* undef, align 1 + ret i32 undef } |