[llvm-commits] [llvm] r168580 - in /llvm/trunk: lib/Transforms/Scalar/SimplifyLibCalls.cpp lib/Transforms/Utils/SimplifyLibCalls.cpp test/Transforms/InstCombine/toascii-1.ll test/Transforms/SimplifyLibCalls/ToAscii.ll
Benjamin Kramer
benny.kra at gmail.com
Mon Nov 26 01:19:20 PST 2012
On 26.11.2012, at 04:41, Meador Inge <meadori at codesourcery.com> wrote:
> Author: meadori
> Date: Sun Nov 25 21:38:52 2012
> New Revision: 168580
>
> URL: http://llvm.org/viewvc/llvm-project?rev=168580&view=rev
> Log:
> instcombine: Migrate toascii optimizations
>
> This patch migrates the toascii optimizations from the simplify-libcalls
> pass into the instcombine library call simplifier.
>
> Added:
> llvm/trunk/test/Transforms/InstCombine/toascii-1.ll
> Removed:
> llvm/trunk/test/Transforms/SimplifyLibCalls/ToAscii.ll
> Modified:
> llvm/trunk/lib/Transforms/Scalar/SimplifyLibCalls.cpp
> llvm/trunk/lib/Transforms/Utils/SimplifyLibCalls.cpp
>
> Modified: llvm/trunk/lib/Transforms/Scalar/SimplifyLibCalls.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/SimplifyLibCalls.cpp?rev=168580&r1=168579&r2=168580&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Transforms/Scalar/SimplifyLibCalls.cpp (original)
> +++ llvm/trunk/lib/Transforms/Scalar/SimplifyLibCalls.cpp Sun Nov 25 21:38:52 2012
> @@ -96,27 +96,6 @@
>
> namespace {
> //===----------------------------------------------------------------------===//
> -// Integer Optimizations
> -//===----------------------------------------------------------------------===//
> -
> -//===---------------------------------------===//
> -// 'toascii' Optimizations
> -
> -struct ToAsciiOpt : public LibCallOptimization {
> - virtual Value *CallOptimizer(Function *Callee, CallInst *CI, IRBuilder<> &B) {
> - FunctionType *FT = Callee->getFunctionType();
> - // We require i32(i32)
> - if (FT->getNumParams() != 1 || FT->getReturnType() != FT->getParamType(0) ||
> - !FT->getParamType(0)->isIntegerTy(32))
> - return 0;
> -
> - // isascii(c) -> c & 0x7f
> - return B.CreateAnd(CI->getArgOperand(0),
> - ConstantInt::get(CI->getType(),0x7F));
> - }
> -};
> -
> -//===----------------------------------------------------------------------===//
> // Formatting and IO Optimizations
> //===----------------------------------------------------------------------===//
>
> @@ -483,8 +462,6 @@
> TargetLibraryInfo *TLI;
>
> StringMap<LibCallOptimization*> Optimizations;
> - // Integer Optimizations
> - ToAsciiOpt ToAscii;
> // Formatting and IO Optimizations
> SPrintFOpt SPrintF; PrintFOpt PrintF;
> FWriteOpt FWrite; FPutsOpt FPuts; FPrintFOpt FPrintF;
> @@ -543,9 +520,6 @@
> /// Optimizations - Populate the Optimizations map with all the optimizations
> /// we know.
> void SimplifyLibCalls::InitOptimizations() {
> - // Integer Optimizations
> - Optimizations["toascii"] = &ToAscii;
> -
> // Formatting and IO Optimizations
> Optimizations["sprintf"] = &SPrintF;
> Optimizations["printf"] = &PrintF;
>
> Modified: llvm/trunk/lib/Transforms/Utils/SimplifyLibCalls.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/SimplifyLibCalls.cpp?rev=168580&r1=168579&r2=168580&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Transforms/Utils/SimplifyLibCalls.cpp (original)
> +++ llvm/trunk/lib/Transforms/Utils/SimplifyLibCalls.cpp Sun Nov 25 21:38:52 2012
> @@ -1298,6 +1298,20 @@
> }
> };
>
> +struct ToAsciiOpt : public LibCallOptimization {
> + virtual Value *callOptimizer(Function *Callee, CallInst *CI, IRBuilder<> &B) {
> + FunctionType *FT = Callee->getFunctionType();
> + // We require i32(i32)
> + if (FT->getNumParams() != 1 || FT->getReturnType() != FT->getParamType(0) ||
> + !FT->getParamType(0)->isIntegerTy(32))
> + return 0;
> +
> + // isascii(c) -> c & 0x7f
toascii?
- Ben
> + return B.CreateAnd(CI->getArgOperand(0),
> + ConstantInt::get(CI->getType(),0x7F));
> + }
> +};
> +
> } // End anonymous namespace.
>
> namespace llvm {
> @@ -1349,6 +1363,7 @@
> AbsOpt Abs;
> IsDigitOpt IsDigit;
> IsAsciiOpt IsAscii;
> + ToAsciiOpt ToAscii;
>
> void initOptimizations();
> void addOpt(LibFunc::Func F, LibCallOptimization* Opt);
> @@ -1469,6 +1484,7 @@
> addOpt(LibFunc::llabs, &Abs);
> addOpt(LibFunc::isdigit, &IsDigit);
> addOpt(LibFunc::isascii, &IsAscii);
> + addOpt(LibFunc::toascii, &ToAscii);
> }
>
> Value *LibCallSimplifierImpl::optimizeCall(CallInst *CI) {
>
> Added: llvm/trunk/test/Transforms/InstCombine/toascii-1.ll
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/toascii-1.ll?rev=168580&view=auto
> ==============================================================================
> --- llvm/trunk/test/Transforms/InstCombine/toascii-1.ll (added)
> +++ llvm/trunk/test/Transforms/InstCombine/toascii-1.ll Sun Nov 25 21:38:52 2012
> @@ -0,0 +1,59 @@
> +; Test that the toascii library call simplifier works correctly.
> +;
> +; RUN: opt < %s -instcombine -S | FileCheck %s
> +
> +target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128"
> +
> +declare i32 @toascii(i32)
> +
> +; Check isascii(c) -> c & 0x7f.
> +
> +define i32 @test_simplify1() {
> +; CHECK: @test_simplify1
> + %ret = call i32 @toascii(i32 0)
> + ret i32 %ret
> +; CHECK-NEXT: ret i32 0
> +}
> +
> +define i32 @test_simplify2() {
> +; CHECK: @test_simplify2
> + %ret = call i32 @toascii(i32 1)
> + ret i32 %ret
> +; CHECK-NEXT: ret i32 1
> +}
> +
> +define i32 @test_simplify3() {
> +; CHECK: @test_simplify3
> + %ret = call i32 @toascii(i32 127)
> + ret i32 %ret
> +; CHECK-NEXT: ret i32 127
> +}
> +
> +define i32 @test_simplify4() {
> +; CHECK: @test_simplify4
> + %ret = call i32 @toascii(i32 128)
> + ret i32 %ret
> +; CHECK-NEXT: ret i32 0
> +}
> +
> +define i32 @test_simplify5() {
> +; CHECK: @test_simplify5
> + %ret = call i32 @toascii(i32 255)
> + ret i32 %ret
> +; CHECK-NEXT: ret i32 127
> +}
> +
> +define i32 @test_simplify6() {
> +; CHECK: @test_simplify6
> + %ret = call i32 @toascii(i32 256)
> + ret i32 %ret
> +; CHECK-NEXT: ret i32 0
> +}
> +
> +define i32 @test_simplify7(i32 %x) {
> +; CHECK: @test_simplify7
> + %ret = call i32 @toascii(i32 %x)
> +; CHECK-NEXT: [[AND:%[a-z0-9]+]] = and i32 %x, 127
> + ret i32 %ret
> +; CHECK-NEXT: ret i32 [[AND]]
> +}
>
> Removed: llvm/trunk/test/Transforms/SimplifyLibCalls/ToAscii.ll
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SimplifyLibCalls/ToAscii.ll?rev=168579&view=auto
> ==============================================================================
> --- llvm/trunk/test/Transforms/SimplifyLibCalls/ToAscii.ll (original)
> +++ llvm/trunk/test/Transforms/SimplifyLibCalls/ToAscii.ll (removed)
> @@ -1,21 +0,0 @@
> -; Test that the ToAsciiOptimizer works correctly
> -; RUN: opt < %s -simplify-libcalls -S | \
> -; RUN: not grep "call.*toascii"
> -
> -declare i32 @toascii(i32)
> -
> -define i32 @main() {
> - %val1 = call i32 @toascii( i32 1 ) ; <i32> [#uses=1]
> - %val2 = call i32 @toascii( i32 0 ) ; <i32> [#uses=1]
> - %val3 = call i32 @toascii( i32 127 ) ; <i32> [#uses=1]
> - %val4 = call i32 @toascii( i32 128 ) ; <i32> [#uses=1]
> - %val5 = call i32 @toascii( i32 255 ) ; <i32> [#uses=1]
> - %val6 = call i32 @toascii( i32 256 ) ; <i32> [#uses=1]
> - %rslt1 = add i32 %val1, %val2 ; <i32> [#uses=1]
> - %rslt2 = add i32 %val3, %val4 ; <i32> [#uses=1]
> - %rslt3 = add i32 %val5, %val6 ; <i32> [#uses=1]
> - %rslt4 = add i32 %rslt1, %rslt2 ; <i32> [#uses=1]
> - %rslt5 = add i32 %rslt4, %rslt3 ; <i32> [#uses=1]
> - ret i32 %rslt5
> -}
> -
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
More information about the llvm-commits
mailing list