From f42450abb604c48d5ab1d617f65bc7457361e237 Mon Sep 17 00:00:00 2001
From: Jingyue Wu <jingyue@google.com>
Date: Fri, 24 Apr 2015 03:26:11 +0000
Subject: [PATCH] Revert r235688

Seems breaking builds


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@235690 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/Target/NVPTX/NVPTXTargetMachine.cpp       |  2 -
 .../NaryReassociate/NVPTX/lit.local.cfg       |  2 -
 .../NaryReassociate/NVPTX/nary-slsr.ll        | 47 -------------------
 3 files changed, 51 deletions(-)
 delete mode 100644 test/Transforms/NaryReassociate/NVPTX/lit.local.cfg
 delete mode 100644 test/Transforms/NaryReassociate/NVPTX/nary-slsr.ll

diff --git a/lib/Target/NVPTX/NVPTXTargetMachine.cpp b/lib/Target/NVPTX/NVPTXTargetMachine.cpp
index ac27c30aaba..dc8e8a29528 100644
--- a/lib/Target/NVPTX/NVPTXTargetMachine.cpp
+++ b/lib/Target/NVPTX/NVPTXTargetMachine.cpp
@@ -179,8 +179,6 @@ void NVPTXPassConfig::addIRPasses() {
     addPass(createGVNPass());
   else
     addPass(createEarlyCSEPass());
-  // Run NaryReassociate after EarlyCSE/GVN to be more effective.
-  addPass(createNaryReassociatePass());
 }
 
 bool NVPTXPassConfig::addInstSelector() {
diff --git a/test/Transforms/NaryReassociate/NVPTX/lit.local.cfg b/test/Transforms/NaryReassociate/NVPTX/lit.local.cfg
deleted file mode 100644
index 2cb98eb371b..00000000000
--- a/test/Transforms/NaryReassociate/NVPTX/lit.local.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-if not 'NVPTX' in config.root.targets:
-    config.unsupported = True
diff --git a/test/Transforms/NaryReassociate/NVPTX/nary-slsr.ll b/test/Transforms/NaryReassociate/NVPTX/nary-slsr.ll
deleted file mode 100644
index 2360fe7f1b7..00000000000
--- a/test/Transforms/NaryReassociate/NVPTX/nary-slsr.ll
+++ /dev/null
@@ -1,47 +0,0 @@
-; RUN: opt < %s -slsr -nary-reassociate -S | FileCheck %s
-; RUN: llc < %s -march=nvptx64 -mcpu=sm_20 | FileCheck %s --check-prefix=PTX
-
-target datalayout = "e-i64:64-v16:16-v32:32-n16:32:64"
-
-; foo((a + b) + c);
-; foo((a + b * 2) + c);
-; foo((a + b * 3) + c);
-;   =>
-; abc = (a + b) + c;
-; foo(abc);
-; ab2c = abc + b;
-; foo(ab2c);
-; ab3c = ab2c + b;
-; foo(ab3c);
-define void @nary_reassociate_after_slsr(i32 %a, i32 %b, i32 %c) {
-; CHECK-LABEL: @nary_reassociate_after_slsr(
-; PTX-LABEL: .visible .func nary_reassociate_after_slsr(
-; PTX: ld.param.u32 [[b:%r[0-9]+]], [nary_reassociate_after_slsr_param_1];
-  %ab = add i32 %a, %b
-  %abc = add i32 %ab, %c
-  call void @foo(i32 %abc)
-; CHECK: call void @foo(i32 %abc)
-; PTX: st.param.b32 [param0+0], [[abc:%r[0-9]+]];
-
-  %b2 = shl i32 %b, 1
-  %ab2 = add i32 %a, %b2
-  %ab2c = add i32 %ab2, %c
-; CHECK-NEXT: %ab2c = add i32 %abc, %b
-; PTX: add.s32 [[ab2c:%r[0-9]+]], [[abc]], [[b]]
-  call void @foo(i32 %ab2c)
-; CHECK-NEXT: call void @foo(i32 %ab2c)
-; PTX: st.param.b32 [param0+0], [[ab2c]];
-
-  %b3 = mul i32 %b, 3
-  %ab3 = add i32 %a, %b3
-  %ab3c = add i32 %ab3, %c
-; CHECK-NEXT: %ab3c = add i32 %ab2c, %b
-; PTX: add.s32 [[ab3c:%r[0-9]+]], [[ab2c]], [[b]]
-  call void @foo(i32 %ab3c)
-; CHECK-NEXT: call void @foo(i32 %ab3c)
-; PTX: st.param.b32 [param0+0], [[ab3c]];
-
-  ret void
-}
-
-declare void @foo(i32)
-- 
2.34.1