[llvm-branch-commits] [llvm-branch] r329662 - Merging r329588:

[Tom Stellard via llvm-branch-commits]

Author: tstellar
Date: Mon Apr  9 19:30:41 2018
New Revision: 329662

URL: http://llvm.org/viewvc/llvm-project?rev=329662&view=rev
Log:
Merging r329588:

------------------------------------------------------------------------
r329588 | tstellar | 2018-04-09 09:09:13 -0700 (Mon, 09 Apr 2018) | 11 lines

AMDGPU: Initialize GlobalISel passes

Summary:
This fixes AMDGPU GlobalISel test failures when enabling the AMDGPU
target without any other targets that use GlobalISel.

Reviewers: arsenm

Subscribers: kzhuravl, wdng, nhaehnle, yaxunl, rovka, kristof.beyls, dstuttard, tpr, llvm-commits, t-tye

Differential Revision: https://reviews.llvm.org/D45353
------------------------------------------------------------------------

Modified:
    llvm/branches/release_60/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp

Modified: llvm/branches/release_60/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_60/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp?rev=329662&r1=329661&r2=329662&view=diff
==============================================================================
--- llvm/branches/release_60/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp (original)
+++ llvm/branches/release_60/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp Mon Apr  9 19:30:41 2018
@@ -147,6 +147,7 @@ extern "C" void LLVMInitializeAMDGPUTarg
   initializeR600PacketizerPass(*PR);
   initializeR600ExpandSpecialInstrsPassPass(*PR);
   initializeR600VectorRegMergerPass(*PR);
+  initializeGlobalISel(*PR);
   initializeAMDGPUDAGToDAGISelPass(*PR);
   initializeSILowerI1CopiesPass(*PR);
   initializeSIFixSGPRCopiesPass(*PR);