diff options
11 files changed, 31 insertions, 13 deletions
diff --git a/llvm/lib/CodeGen/TypePromotion.cpp b/llvm/lib/CodeGen/TypePromotion.cpp index d78589c4a05..000cd366dd6 100644 --- a/llvm/lib/CodeGen/TypePromotion.cpp +++ b/llvm/lib/CodeGen/TypePromotion.cpp @@ -46,7 +46,7 @@ using namespace llvm; static cl::opt<bool> -DisablePromotion("disable-type-promotion", cl::Hidden, cl::init(true), +DisablePromotion("disable-type-promotion", cl::Hidden, cl::init(false), cl::desc("Disable type promotion pass")); // The goal of this pass is to enable more efficient code generation for @@ -902,16 +902,34 @@ bool TypePromotion::TryToPromote(Value *V, unsigned PromotedWidth) { for (auto *I : CurrentVisited) I->dump(); ); + + // Check that promoting this at the IR level is most likely beneficial. It's + // more likely if we're operating over multiple blocks and handling wrapping + // instructions. unsigned ToPromote = 0; + unsigned NonFreeArgs = 0; + SmallPtrSet<BasicBlock*, 4> Blocks; for (auto *V : CurrentVisited) { - if (Sources.count(V)) + if (auto *I = dyn_cast<Instruction>(V)) + Blocks.insert(I->getParent()); + + if (Sources.count(V)) { + if (auto *Arg = dyn_cast<Argument>(V)) { + if (!Arg->hasZExtAttr() && !Arg->hasSExtAttr()) + ++NonFreeArgs; + } continue; + } + if (Sinks.count(cast<Instruction>(V))) continue; + ++ToPromote; } - if (ToPromote < 2) + // DAG optimisations should be able to handle these cases better, especially + // for function arguments. + if (ToPromote < 2 || (Blocks.size() == 1 && (NonFreeArgs > SafeWrap.size()))) return false; Promoter->Mutate(OrigTy, PromotedWidth, CurrentVisited, Sources, Sinks, diff --git a/llvm/test/Transforms/TypePromotion/ARM/calls.ll b/llvm/test/Transforms/TypePromotion/ARM/calls.ll index cd273c06150..8c14a3a076f 100644 --- a/llvm/test/Transforms/TypePromotion/ARM/calls.ll +++ b/llvm/test/Transforms/TypePromotion/ARM/calls.ll @@ -1,5 +1,5 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py -; RUN: opt -mtriple=arm -type-promotion -verify -disable-type-promotion=false -S %s -o - | FileCheck %s +; RUN: opt -mtriple=arm -type-promotion -verify -S %s -o - | FileCheck %s define i8 @call_with_imms(i8* %arg) { ; CHECK-LABEL: @call_with_imms( diff --git a/llvm/test/Transforms/TypePromotion/ARM/casts.ll b/llvm/test/Transforms/TypePromotion/ARM/casts.ll index 70fa617115e..66c713ce305 100644 --- a/llvm/test/Transforms/TypePromotion/ARM/casts.ll +++ b/llvm/test/Transforms/TypePromotion/ARM/casts.ll @@ -1,5 +1,5 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py -; RUN: opt -mtriple=arm -type-promotion -verify -disable-type-promotion=false -S %s -o - | FileCheck %s +; RUN: opt -mtriple=arm -type-promotion -verify -S %s -o - | FileCheck %s define i16 @dsp_trunc(i32 %arg0, i32 %arg1, i16* %gep0, i16* %gep1) { ; CHECK-LABEL: @dsp_trunc( diff --git a/llvm/test/Transforms/TypePromotion/ARM/clear-structures.ll b/llvm/test/Transforms/TypePromotion/ARM/clear-structures.ll index 117c4c0d5c8..aae729fcc92 100644 --- a/llvm/test/Transforms/TypePromotion/ARM/clear-structures.ll +++ b/llvm/test/Transforms/TypePromotion/ARM/clear-structures.ll @@ -1,5 +1,5 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py -; RUN: opt -mtriple=arm -type-promotion -verify -disable-type-promotion=false -S %s -o - | FileCheck %s +; RUN: opt -mtriple=arm -type-promotion -verify -S %s -o - | FileCheck %s define i32 @clear_structures(i8* nocapture readonly %fmt, [1 x i32] %ap.coerce, i8* %out, void (i32, i8*)* nocapture %write) { ; CHECK-LABEL: @clear_structures( diff --git a/llvm/test/Transforms/TypePromotion/ARM/icmps.ll b/llvm/test/Transforms/TypePromotion/ARM/icmps.ll index 6dda15c309b..8d33c345c64 100644 --- a/llvm/test/Transforms/TypePromotion/ARM/icmps.ll +++ b/llvm/test/Transforms/TypePromotion/ARM/icmps.ll @@ -1,5 +1,5 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py -; RUN: opt -mtriple=arm -type-promotion -verify -disable-type-promotion=false -S %s -o - | FileCheck %s +; RUN: opt -mtriple=arm -type-promotion -verify -S %s -o - | FileCheck %s define i32 @test_ult_254_inc_imm(i8 zeroext %x) { ; CHECK-LABEL: @test_ult_254_inc_imm( diff --git a/llvm/test/Transforms/TypePromotion/ARM/phis-ret.ll b/llvm/test/Transforms/TypePromotion/ARM/phis-ret.ll index e79e4ff1bdb..12001a40aa0 100644 --- a/llvm/test/Transforms/TypePromotion/ARM/phis-ret.ll +++ b/llvm/test/Transforms/TypePromotion/ARM/phis-ret.ll @@ -1,5 +1,5 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py -; RUN: opt -mtriple=arm -type-promotion -verify -disable-type-promotion=false -S %s -o - | FileCheck %s +; RUN: opt -mtriple=arm -type-promotion -verify -S %s -o - | FileCheck %s ; Check that the arguments are extended but then nothing else is. ; This also ensures that the pass can handle loops. diff --git a/llvm/test/Transforms/TypePromotion/ARM/pointers.ll b/llvm/test/Transforms/TypePromotion/ARM/pointers.ll index 3c5f097b1b9..7369b18bbd6 100644 --- a/llvm/test/Transforms/TypePromotion/ARM/pointers.ll +++ b/llvm/test/Transforms/TypePromotion/ARM/pointers.ll @@ -1,5 +1,5 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py -; RUN: opt -mtriple=arm -type-promotion -verify -disable-type-promotion=false -S %s -o - | FileCheck %s +; RUN: opt -mtriple=arm -type-promotion -verify -S %s -o - | FileCheck %s define void @phi_pointers(i16* %a, i16* %b, i8 zeroext %M, i8 zeroext %N) { ; CHECK-LABEL: @phi_pointers( diff --git a/llvm/test/Transforms/TypePromotion/ARM/signed-icmps.ll b/llvm/test/Transforms/TypePromotion/ARM/signed-icmps.ll index dfdd4c10ae8..3655ff0e7e6 100644 --- a/llvm/test/Transforms/TypePromotion/ARM/signed-icmps.ll +++ b/llvm/test/Transforms/TypePromotion/ARM/signed-icmps.ll @@ -1,5 +1,5 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py -; RUN: opt -mtriple=arm -type-promotion -verify -disable-type-promotion=false -S %s -o - | FileCheck %s +; RUN: opt -mtriple=arm -type-promotion -verify -S %s -o - | FileCheck %s define i8 @eq_sgt(i8* %x, i8 *%y, i8 zeroext %z) { ; CHECK-LABEL: @eq_sgt( diff --git a/llvm/test/Transforms/TypePromotion/ARM/signed.ll b/llvm/test/Transforms/TypePromotion/ARM/signed.ll index 143220a53b5..e2fabb93fbd 100644 --- a/llvm/test/Transforms/TypePromotion/ARM/signed.ll +++ b/llvm/test/Transforms/TypePromotion/ARM/signed.ll @@ -1,5 +1,5 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py -; RUN: opt -mtriple=arm -type-promotion -verify -disable-type-promotion=false -S %s -o - | FileCheck %s +; RUN: opt -mtriple=arm -type-promotion -verify -S %s -o - | FileCheck %s ; Test to check that ARMCodeGenPrepare doesn't optimised away sign extends. define i16 @test_signed_load(i16* %ptr) { diff --git a/llvm/test/Transforms/TypePromotion/ARM/switch.ll b/llvm/test/Transforms/TypePromotion/ARM/switch.ll index 6736ebeea4c..058101f3495 100644 --- a/llvm/test/Transforms/TypePromotion/ARM/switch.ll +++ b/llvm/test/Transforms/TypePromotion/ARM/switch.ll @@ -1,5 +1,5 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py -; RUN: opt -mtriple=arm -type-promotion -verify -disable-type-promotion=false -S %s -o - | FileCheck %s +; RUN: opt -mtriple=arm -type-promotion -verify -S %s -o - | FileCheck %s define void @truncate_source_phi_switch(i8* %memblock, i8* %store, i16 %arg) { ; CHECK-LABEL: @truncate_source_phi_switch( diff --git a/llvm/test/Transforms/TypePromotion/ARM/wrapping.ll b/llvm/test/Transforms/TypePromotion/ARM/wrapping.ll index 23e50dec0ca..346114aac3c 100644 --- a/llvm/test/Transforms/TypePromotion/ARM/wrapping.ll +++ b/llvm/test/Transforms/TypePromotion/ARM/wrapping.ll @@ -1,5 +1,5 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py -; RUN: opt -mtriple=arm -type-promotion -verify -disable-type-promotion=false -S %s -o - | FileCheck %s +; RUN: opt -mtriple=arm -type-promotion -verify -S %s -o - | FileCheck %s define zeroext i16 @overflow_add(i16 zeroext %a, i16 zeroext %b) { ; CHECK-LABEL: @overflow_add( |
