From 87aac6a8772e71e2edc7faceaace9cf8d9db88ea Mon Sep 17 00:00:00 2001 From: Lang Hames Date: Wed, 25 Apr 2012 02:16:54 +0000 Subject: [PATCH] Reverting r155468. Chris and Chandler have convinced me that it's dangerous and in poor taste. Talking through some alternate solutions with Chandler. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@155530 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../InstCombine/InstCombineCalls.cpp | 35 ---------- .../InstCombine/2012-04-23-Neon-Intrinsics.ll | 68 ------------------- 2 files changed, 103 deletions(-) diff --git a/lib/Transforms/InstCombine/InstCombineCalls.cpp b/lib/Transforms/InstCombine/InstCombineCalls.cpp index 5ad9382e3cc..77e47271008 100644 --- a/lib/Transforms/InstCombine/InstCombineCalls.cpp +++ b/lib/Transforms/InstCombine/InstCombineCalls.cpp @@ -14,7 +14,6 @@ #include "InstCombine.h" #include "llvm/Support/CallSite.h" #include "llvm/Target/TargetData.h" -#include "llvm/Analysis/InstructionSimplify.h" #include "llvm/Analysis/MemoryBuiltins.h" #include "llvm/Transforms/Utils/BuildLibCalls.h" #include "llvm/Transforms/Utils/Local.h" @@ -695,40 +694,6 @@ Instruction *InstCombiner::visitCallInst(CallInst &CI) { break; } - case Intrinsic::arm_neon_vmulls: - case Intrinsic::arm_neon_vmullu: { - // Zext/sext intrinsic operands according to the intrinsic type, then try to - // simplify them. This lets us try a SimplifyMulInst on the extended - // operands. If the zext/sext instructions are unused when we're done then - // delete them from the block. - Value* Arg0 = II->getArgOperand(0); - Value* Arg1 = II->getArgOperand(1); - bool Zext = (II->getIntrinsicID() == Intrinsic::arm_neon_vmullu); - Instruction *Arg0W = - Zext ? CastInst::CreateZExtOrBitCast(Arg0, II->getType(), "", II) : - CastInst::CreateSExtOrBitCast(Arg0, II->getType(), "", II); - Value* Arg0WS = SimplifyInstruction(Arg0W); - if (Arg0WS == 0) // If simplification fails just pass through the ext'd val. - Arg0WS = Arg0W; - Instruction *Arg1W = - Zext ? CastInst::CreateZExtOrBitCast(Arg1, II->getType(), "", II) : - CastInst::CreateSExtOrBitCast(Arg1, II->getType(), "", II); - Value* Arg1WS = SimplifyInstruction(Arg1W); - if (Arg1WS == 0) - Arg1WS = Arg1W; - Instruction *SimplifiedInst = 0; - if (Value* V = SimplifyMulInst(Arg0WS, Arg1WS, TD)) { - SimplifiedInst = ReplaceInstUsesWith(CI, V); - } - if (Arg0W->use_empty()) - Arg0W->eraseFromParent(); - if (Arg1W->use_empty()) - Arg1W->eraseFromParent(); - if (SimplifiedInst != 0) - return SimplifiedInst; - break; - } - case Intrinsic::stackrestore: { // If the save is right next to the restore, remove the restore. This can // happen when variable allocas are DCE'd. diff --git a/test/Transforms/InstCombine/2012-04-23-Neon-Intrinsics.ll b/test/Transforms/InstCombine/2012-04-23-Neon-Intrinsics.ll index 9bb988c37c0..e69de29bb2d 100644 --- a/test/Transforms/InstCombine/2012-04-23-Neon-Intrinsics.ll +++ b/test/Transforms/InstCombine/2012-04-23-Neon-Intrinsics.ll @@ -1,68 +0,0 @@ -target datalayout = "e-p:32:32:32-i1:8:32-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:32:64-v128:32:128-a0:0:32-n32-S32" -target triple = "thumbv7-apple-ios0" - -; RUN: opt -S -instcombine < %s | FileCheck %s - -define <4 x i32> @mulByZero(<4 x i16> %x) nounwind readnone ssp { -entry: - %a = tail call <4 x i32> @llvm.arm.neon.vmulls.v4i32(<4 x i16> %x, <4 x i16> zeroinitializer) nounwind - ret <4 x i32> %a -; CHECK: entry: -; CHECK-NEXT: ret <4 x i32> zeroinitializer -} - -define <4 x i32> @mulByOne(<4 x i16> %x) nounwind readnone ssp { -entry: - %a = tail call <4 x i32> @llvm.arm.neon.vmulls.v4i32(<4 x i16> %x, <4 x i16> ) nounwind - ret <4 x i32> %a -; CHECK: entry: -; CHECK-NEXT: %0 = sext <4 x i16> %x to <4 x i32> -; CHECK-NEXT: ret <4 x i32> %0 -} - -define <4 x i32> @constantMul() nounwind readnone ssp { -entry: - %a = tail call <4 x i32> @llvm.arm.neon.vmulls.v4i32(<4 x i16> , <4 x i16> ) nounwind - ret <4 x i32> %a -; CHECK: entry: -; CHECK-NEXT: ret <4 x i32> -} - -define <4 x i32> @constantMulS() nounwind readnone ssp { -entry: - %b = tail call <4 x i32> @llvm.arm.neon.vmulls.v4i32(<4 x i16> , <4 x i16> ) nounwind - ret <4 x i32> %b -; CHECK: entry: -; CHECK-NEXT: ret <4 x i32> -} - -define <4 x i32> @constantMulU() nounwind readnone ssp { -entry: - %b = tail call <4 x i32> @llvm.arm.neon.vmullu.v4i32(<4 x i16> , <4 x i16> ) nounwind - ret <4 x i32> %b -; CHECK: entry: -; CHECK-NEXT: ret <4 x i32> -} - -define <4 x i32> @complex1(<4 x i16> %x) nounwind readnone ssp { -entry: - %a = tail call <4 x i32> @llvm.arm.neon.vmulls.v4i32(<4 x i16> , <4 x i16> %x) nounwind - %b = add <4 x i32> zeroinitializer, %a - ret <4 x i32> %b -; CHECK: entry: -; CHECK-NEXT: %a = tail call <4 x i32> @llvm.arm.neon.vmulls.v4i32(<4 x i16> , <4 x i16> %x) nounwind -; CHECK-NEXT: ret <4 x i32> %a -} - -define <4 x i32> @complex2(<4 x i32> %x) nounwind readnone ssp { -entry: - %a = tail call <4 x i32> @llvm.arm.neon.vmulls.v4i32(<4 x i16> , <4 x i16> ) nounwind - %b = add <4 x i32> %x, %a - ret <4 x i32> %b -; CHECK: entry: -; CHECK-NEXT: %b = add <4 x i32> %x, -; CHECK-NEXT: ret <4 x i32> %b -} - -declare <4 x i32> @llvm.arm.neon.vmulls.v4i32(<4 x i16>, <4 x i16>) nounwind readnone -declare <4 x i32> @llvm.arm.neon.vmullu.v4i32(<4 x i16>, <4 x i16>) nounwind readnone