[PATCH] D93708: [AMDGPU] Add a new Clamp Pattern to the GlobalISel Path.

[Thomas Symalla via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rGfaeed774d157: Fixed includes. (authored by tsymalla).

Changed prior to commit:
  https://reviews.llvm.org/D93708?vs=320405&id=320699#toc

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D93708/new/

https://reviews.llvm.org/D93708

Files:
  llvm/lib/Target/AMDGPU/AMDGPUPostLegalizerCombiner.cpp


Index: llvm/lib/Target/AMDGPU/AMDGPUPostLegalizerCombiner.cpp
===================================================================
--- llvm/lib/Target/AMDGPU/AMDGPUPostLegalizerCombiner.cpp
+++ llvm/lib/Target/AMDGPU/AMDGPUPostLegalizerCombiner.cpp
@@ -11,22 +11,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 #include "AMDGPU.h"
 #include "AMDGPULegalizerInfo.h"
 #include "GCNSubtarget.h"
-=======
-#include "AMDGPULegalizerInfo.h"
-#include "AMDGPUTargetMachine.h"
->>>>>>> clang-format
 #include "MCTargetDesc/AMDGPUMCTargetDesc.h"
-=======
-#include "AMDGPUTargetMachine.h"
-#include "AMDGPULegalizerInfo.h"
-
-
->>>>>>> Updating formatting changes.
 #include "llvm/CodeGen/GlobalISel/Combiner.h"
 #include "llvm/CodeGen/GlobalISel/CombinerHelper.h"
 #include "llvm/CodeGen/GlobalISel/CombinerInfo.h"
@@ -34,15 +22,7 @@
 #include "llvm/CodeGen/GlobalISel/MIPatternMatch.h"
 #include "llvm/CodeGen/MachineDominators.h"
 #include "llvm/CodeGen/TargetPassConfig.h"
-<<<<<<< HEAD
 #include "llvm/Target/TargetMachine.h"
-=======
-#include "llvm/Support/Debug.h"
-<<<<<<< HEAD
->>>>>>> clang-format
-=======
-#include "MCTargetDesc/AMDGPUMCTargetDesc.h"
->>>>>>> Updating formatting changes.
 
 #define DEBUG_TYPE "amdgpu-postlegalizer-combiner"
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D93708.320699.patch
Type: text/x-patch
Size: 1323 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20210202/58388bff/attachment.bin>