From 6c85e98f06426c2a1b33e0e862edc1afc0810d5d Mon Sep 17 00:00:00 2001 From: Thomas Symalla Date: Mon, 1 Feb 2021 16:59:57 +0100 Subject: [PATCH] Fixed includes. --- llvm/lib/Target/AMDGPU/AMDGPUPreLegalizerCombiner.cpp | 11 ----------- 1 file changed, 11 deletions(-) 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" -- 2.7.4