From: Thomas Symalla <thomas.symalla@amd.com>
Date: Mon, 1 Feb 2021 15:59:57 +0000 (+0100)
Subject: Fixed includes.
X-Git-Tag: llvmorg-14-init~16321
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6c85e98f06426c2a1b33e0e862edc1afc0810d5d;p=platform%2Fupstream%2Fllvm.git

Fixed includes.
---

diff --git a/llvm/lib/Target/AMDGPU/AMDGPUPreLegalizerCombiner.cpp b/llvm/lib/Target/AMDGPU/AMDGPUPreLegalizerCombiner.cpp
index db2cb2d..c46aed3 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPUPreLegalizerCombiner.cpp
+++ b/llvm/lib/Target/AMDGPU/AMDGPUPreLegalizerCombiner.cpp
@@ -11,21 +11,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 #include "AMDGPU.h"
-<<<<<<< HEAD
-=======
-#include "AMDGPULegalizerInfo.h"
-=======
->>>>>>> Added and used new target pseudo for v_cvt_pk_i16_i32, changes due to code review.
-#include "AMDGPUTargetMachine.h"
->>>>>>> Move Combiner to PreLegalize step
-=======
 #include "AMDGPULegalizerInfo.h"
 #include "GCNSubtarget.h"
 #include "MCTargetDesc/AMDGPUMCTargetDesc.h"
->>>>>>> Added missing includes.
 #include "llvm/CodeGen/GlobalISel/Combiner.h"
 #include "llvm/CodeGen/GlobalISel/CombinerHelper.h"
 #include "llvm/CodeGen/GlobalISel/CombinerInfo.h"