From 38c4441797a9c90dee830d9b90491742ff83d42c Mon Sep 17 00:00:00 2001 From: Meador Inge Date: Mon, 26 Nov 2012 03:38:52 +0000 Subject: [PATCH] instcombine: Migrate toascii optimizations This patch migrates the toascii optimizations from the simplify-libcalls pass into the instcombine library call simplifier. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@168580 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Transforms/Scalar/SimplifyLibCalls.cpp | 26 --------- lib/Transforms/Utils/SimplifyLibCalls.cpp | 16 ++++++ test/Transforms/InstCombine/toascii-1.ll | 59 +++++++++++++++++++++ test/Transforms/SimplifyLibCalls/ToAscii.ll | 21 -------- 4 files changed, 75 insertions(+), 47 deletions(-) create mode 100644 test/Transforms/InstCombine/toascii-1.ll delete mode 100644 test/Transforms/SimplifyLibCalls/ToAscii.ll diff --git a/lib/Transforms/Scalar/SimplifyLibCalls.cpp b/lib/Transforms/Scalar/SimplifyLibCalls.cpp index 64384debf6f..4db15a62d52 100644 --- a/lib/Transforms/Scalar/SimplifyLibCalls.cpp +++ b/lib/Transforms/Scalar/SimplifyLibCalls.cpp @@ -95,27 +95,6 @@ static bool CallHasFloatingPointArgument(const CallInst *CI) { } 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 @@ namespace { TargetLibraryInfo *TLI; StringMap Optimizations; - // Integer Optimizations - ToAsciiOpt ToAscii; // Formatting and IO Optimizations SPrintFOpt SPrintF; PrintFOpt PrintF; FWriteOpt FWrite; FPutsOpt FPuts; FPrintFOpt FPrintF; @@ -543,9 +520,6 @@ void SimplifyLibCalls::AddOpt(LibFunc::Func F1, LibFunc::Func F2, /// 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; diff --git a/lib/Transforms/Utils/SimplifyLibCalls.cpp b/lib/Transforms/Utils/SimplifyLibCalls.cpp index 2b390c191cc..27ccdc1095e 100644 --- a/lib/Transforms/Utils/SimplifyLibCalls.cpp +++ b/lib/Transforms/Utils/SimplifyLibCalls.cpp @@ -1298,6 +1298,20 @@ struct IsAsciiOpt : public LibCallOptimization { } }; +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)); + } +}; + } // End anonymous namespace. namespace llvm { @@ -1349,6 +1363,7 @@ class LibCallSimplifierImpl { AbsOpt Abs; IsDigitOpt IsDigit; IsAsciiOpt IsAscii; + ToAsciiOpt ToAscii; void initOptimizations(); void addOpt(LibFunc::Func F, LibCallOptimization* Opt); @@ -1469,6 +1484,7 @@ void LibCallSimplifierImpl::initOptimizations() { addOpt(LibFunc::llabs, &Abs); addOpt(LibFunc::isdigit, &IsDigit); addOpt(LibFunc::isascii, &IsAscii); + addOpt(LibFunc::toascii, &ToAscii); } Value *LibCallSimplifierImpl::optimizeCall(CallInst *CI) { diff --git a/test/Transforms/InstCombine/toascii-1.ll b/test/Transforms/InstCombine/toascii-1.ll new file mode 100644 index 00000000000..c4a13e22939 --- /dev/null +++ b/test/Transforms/InstCombine/toascii-1.ll @@ -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]] +} diff --git a/test/Transforms/SimplifyLibCalls/ToAscii.ll b/test/Transforms/SimplifyLibCalls/ToAscii.ll deleted file mode 100644 index aef47333b3c..00000000000 --- a/test/Transforms/SimplifyLibCalls/ToAscii.ll +++ /dev/null @@ -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 ) ; [#uses=1] - %val2 = call i32 @toascii( i32 0 ) ; [#uses=1] - %val3 = call i32 @toascii( i32 127 ) ; [#uses=1] - %val4 = call i32 @toascii( i32 128 ) ; [#uses=1] - %val5 = call i32 @toascii( i32 255 ) ; [#uses=1] - %val6 = call i32 @toascii( i32 256 ) ; [#uses=1] - %rslt1 = add i32 %val1, %val2 ; [#uses=1] - %rslt2 = add i32 %val3, %val4 ; [#uses=1] - %rslt3 = add i32 %val5, %val6 ; [#uses=1] - %rslt4 = add i32 %rslt1, %rslt2 ; [#uses=1] - %rslt5 = add i32 %rslt4, %rslt3 ; [#uses=1] - ret i32 %rslt5 -} - -- 2.34.1