From 0da00372337cd831ba9ba13a7700009c4dae19c0 Mon Sep 17 00:00:00 2001
From: George Burgess IV <george.burgess.iv@gmail.com>
Date: Tue, 31 Jul 2018 21:18:44 +0000
Subject: Revert r338431: "Add DebugCounters to DivRemPairs"

This reverts r338431; the test it added is making buildbots unhappy.
Locally, I can repro the failure on reverse-iteration builds.



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@338442 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/Transforms/Scalar/DivRemPairs.cpp  |  6 ---
 test/Other/debugcounter-divrempairs.ll | 90 ----------------------------------
 2 files changed, 96 deletions(-)
 delete mode 100644 test/Other/debugcounter-divrempairs.ll

diff --git a/lib/Transforms/Scalar/DivRemPairs.cpp b/lib/Transforms/Scalar/DivRemPairs.cpp
index ffcf34f1cf7..e1bc590c5c9 100644
--- a/lib/Transforms/Scalar/DivRemPairs.cpp
+++ b/lib/Transforms/Scalar/DivRemPairs.cpp
@@ -21,7 +21,6 @@
 #include "llvm/IR/Dominators.h"
 #include "llvm/IR/Function.h"
 #include "llvm/Pass.h"
-#include "llvm/Support/DebugCounter.h"
 #include "llvm/Transforms/Scalar.h"
 #include "llvm/Transforms/Utils/BypassSlowDivision.h"
 using namespace llvm;
@@ -30,8 +29,6 @@ using namespace llvm;
 STATISTIC(NumPairs, "Number of div/rem pairs");
 STATISTIC(NumHoisted, "Number of instructions hoisted");
 STATISTIC(NumDecomposed, "Number of instructions decomposed");
-DEBUG_COUNTER(DRPCounter, "div-rem-pairs-transform",
-              "Controls transformations in div-rem-pairs pass");
 
 /// Find matching pairs of integer div/rem ops (they have the same numerator,
 /// denominator, and signedness). If they exist in different basic blocks, bring
@@ -96,9 +93,6 @@ static bool optimizeDivRem(Function &F, const TargetTransformInfo &TTI,
     if (!DivDominates && !DT.dominates(RemInst, DivInst))
       continue;
 
-    if (!DebugCounter::shouldExecute(DRPCounter))
-      continue;
-
     if (HasDivRemOp) {
       // The target has a single div/rem operation. Hoist the lower instruction
       // to make the matched pair visible to the backend.
diff --git a/test/Other/debugcounter-divrempairs.ll b/test/Other/debugcounter-divrempairs.ll
deleted file mode 100644
index 8da10091274..00000000000
--- a/test/Other/debugcounter-divrempairs.ll
+++ /dev/null
@@ -1,90 +0,0 @@
-; RUN: opt < %s -div-rem-pairs -debug-counter=div-rem-pairs-transform-skip=1,div-rem-pairs-transform-count=1 \
-; RUN:          -S -mtriple=x86_64-unknown-unknown    | FileCheck %s
-;; Test that, with debug counters on, we only skip the first div-rem-pairs opportunity, optimize one after it,
-;; and then ignore all the others. There is 1 optimization opportunity in f1, 2 in f2, and another 1 in f3,
-;; only the first one in f2 will be performed.
-
-define i64 @f1(i64 %a, i64 %b) {
-; CHECK-LABEL: @f1(
-; CHECK-NEXT:  entry:
-; CHECK-NEXT:    [[REM:%.*]] = urem i64 %a, %b
-; CHECK-NEXT:    [[CMP:%.*]] = icmp eq i64 [[REM]], 42
-; CHECK-NEXT:    br i1 [[CMP]], label %if, label %end
-; CHECK:       if:
-; CHECK-NEXT:    [[DIV:%.*]] = udiv i64 %a, %b
-; CHECK-NEXT:    br label %end
-; CHECK:       end:
-; CHECK-NEXT:    [[RET:%.*]] = phi i64 [ [[DIV]], %if ], [ 3, %entry ]
-; CHECK-NEXT:    ret i64 [[RET]]
-;
-entry:
-  %rem = urem i64 %a, %b
-  %cmp = icmp eq i64 %rem, 42
-  br i1 %cmp, label %if, label %end
-
-if:
-  %div = udiv i64 %a, %b
-  br label %end
-
-end:
-  %ret = phi i64 [ %div, %if ], [ 3, %entry ]
-  ret i64 %ret
-}
-
-define i16 @f2(i16 %a, i16 %b) {
-; CHECK-LABEL: @f2(
-; CHECK-NEXT:  entry:
-; CHECK-NEXT:    [[DIV1:%.*]] = sdiv i16 %a, %b
-; CHECK-NEXT:    [[REM1:%.*]] = srem i16 %a, %b
-; CHECK-NEXT:    [[DIV2:%.*]] = udiv i16 %a, %b
-; CHECK-NEXT:    [[CMP:%.*]] = icmp eq i16 [[DIV1]], 42
-; CHECK-NEXT:    br i1 [[CMP]], label %if, label %end
-; CHECK:       if:
-; CHECK-NEXT:    [[REM2:%.*]] = urem i16 %a, %b
-; CHECK-NEXT:    br label %end
-; CHECK:       end:
-; CHECK-NEXT:    [[RET:%.*]] = phi i16 [ [[REM1]], %if ], [ 3, %entry ]
-; CHECK-NEXT:    ret i16 [[RET]]
-;
-entry:
-  %div1 = sdiv i16 %a, %b
-  %div2 = udiv i16 %a, %b
-  %cmp = icmp eq i16 %div1, 42
-  br i1 %cmp, label %if, label %end
-
-if:
-  %rem1 = srem i16 %a, %b
-  %rem2 = urem i16 %a, %b
-  br label %end
-
-end:
-  %ret = phi i16 [ %rem1, %if ], [ 3, %entry ]
-  ret i16 %ret
-}
-
-define i32 @f3(i32 %a, i32 %b) {
-; CHECK-LABEL: @f3(
-; CHECK-NEXT:  entry:
-; CHECK-NEXT:    [[REM:%.*]] = srem i32 %a, %b
-; CHECK-NEXT:    [[CMP:%.*]] = icmp eq i32 [[REM]], 42
-; CHECK-NEXT:    br i1 [[CMP]], label %if, label %end
-; CHECK:       if:
-; CHECK-NEXT:    [[DIV:%.*]] = sdiv i32 %a, %b
-; CHECK-NEXT:    br label %end
-; CHECK:       end:
-; CHECK-NEXT:    [[RET:%.*]] = phi i32 [ [[DIV]], %if ], [ 3, %entry ]
-; CHECK-NEXT:    ret i32 [[RET]]
-;
-entry:
-  %rem = srem i32 %a, %b
-  %cmp = icmp eq i32 %rem, 42
-  br i1 %cmp, label %if, label %end
-
-if:
-  %div = sdiv i32 %a, %b
-  br label %end
-
-end:
-  %ret = phi i32 [ %div, %if ], [ 3, %entry ]
-  ret i32 %ret
-}
\ No newline at end of file
-- 
cgit v1.2.3