From ee1439d66476ddc96ca950a8b3738528d2c9964c Mon Sep 17 00:00:00 2001
From: Davide Italiano <davide@freebsd.org>
Date: Thu, 22 Dec 2016 16:35:02 +0000
Subject: [PATCH] [NewGVN] Add the pass to PassRegistry.def.

We need to hook up here to get it working with the new PM.
Add a test while here (and remove a typo).

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@290350 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/Passes/PassBuilder.cpp             | 1 +
 lib/Passes/PassRegistry.def            | 1 +
 test/Transforms/NewGVN/basic.ll        | 1 -
 test/Transforms/NewGVN/br-identical.ll | 1 +
 4 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/Passes/PassBuilder.cpp b/lib/Passes/PassBuilder.cpp
index 7ae9e97e5cd..58b242efa34 100644
--- a/lib/Passes/PassBuilder.cpp
+++ b/lib/Passes/PassBuilder.cpp
@@ -112,6 +112,7 @@
 #include "llvm/Transforms/Scalar/MemCpyOptimizer.h"
 #include "llvm/Transforms/Scalar/MergedLoadStoreMotion.h"
 #include "llvm/Transforms/Scalar/NaryReassociate.h"
+#include "llvm/Transforms/Scalar/NewGVN.h"
 #include "llvm/Transforms/Scalar/PartiallyInlineLibCalls.h"
 #include "llvm/Transforms/Scalar/Reassociate.h"
 #include "llvm/Transforms/Scalar/SCCP.h"
diff --git a/lib/Passes/PassRegistry.def b/lib/Passes/PassRegistry.def
index da5b5a24434..a9939fddb98 100644
--- a/lib/Passes/PassRegistry.def
+++ b/lib/Passes/PassRegistry.def
@@ -164,6 +164,7 @@ FUNCTION_PASS("mem2reg", PromotePass())
 FUNCTION_PASS("memcpyopt", MemCpyOptPass())
 FUNCTION_PASS("mldst-motion", MergedLoadStoreMotionPass())
 FUNCTION_PASS("nary-reassociate", NaryReassociatePass())
+FUNCTION_PASS("newgvn", NewGVNPass())
 FUNCTION_PASS("jump-threading", JumpThreadingPass())
 FUNCTION_PASS("partially-inline-libcalls", PartiallyInlineLibCallsPass())
 FUNCTION_PASS("lcssa", LCSSAPass())
diff --git a/test/Transforms/NewGVN/basic.ll b/test/Transforms/NewGVN/basic.ll
index 40c83a1d03f..f6670aac6cc 100644
--- a/test/Transforms/NewGVN/basic.ll
+++ b/test/Transforms/NewGVN/basic.ll
@@ -1,6 +1,5 @@
 ; XFAIL: *
 ; RUN: opt < %s -newgvn -S | FileCheck %s
-; RUN: opt < %s -passes=gvn -S | FileCheck %s
 
 define i32 @main() {
 block1:
diff --git a/test/Transforms/NewGVN/br-identical.ll b/test/Transforms/NewGVN/br-identical.ll
index 672887ccf19..cd0613145cd 100644
--- a/test/Transforms/NewGVN/br-identical.ll
+++ b/test/Transforms/NewGVN/br-identical.ll
@@ -1,4 +1,5 @@
 ; RUN: opt -newgvn -S -o - %s | FileCheck %s
+; RUN: opt -passes=newgvn -S -o - %s | FileCheck %s
 
 ; If a branch has two identical successors, we cannot declare either dead.
 
-- 
2.11.0