[llvm] 9e8d59a - AMDGPU/GlobalISel: Remove hack for combines forming illegal extloads

[Matt Arsenault via llvm-commits]

Author: Matt Arsenault
Date: 2020-08-19T14:15:38-04:00
New Revision: 9e8d59a9b81ec152e33881ed5bd3aa07ac805db0

URL: https://github.com/llvm/llvm-project/commit/9e8d59a9b81ec152e33881ed5bd3aa07ac805db0
DIFF: https://github.com/llvm/llvm-project/commit/9e8d59a9b81ec152e33881ed5bd3aa07ac805db0.diff

LOG: AMDGPU/GlobalISel: Remove hack for combines forming illegal extloads

Previously we weren't adding the LegalizerInfo to the post-legalizer
combiner. Since that's fixed, we don't need to try to filter out the
one case that was breaking.

Added: 
    

Modified: 
    llvm/lib/Target/AMDGPU/AMDGPUCombine.td

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Target/AMDGPU/AMDGPUCombine.td b/llvm/lib/Target/AMDGPU/AMDGPUCombine.td
index faaf9168d0dd..d243074aa2fd 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPUCombine.td
+++ b/llvm/lib/Target/AMDGPU/AMDGPUCombine.td
@@ -47,18 +47,9 @@ def AMDGPUPreLegalizerCombinerHelper: GICombinerHelper<
   let DisableRuleOption = "amdgpuprelegalizercombiner-disable-rule";
 }
 
-
-// FIXME: combines_for_extload can introduce illegal extloads which
-// aren't re-legalized.
-// FIXME: Is there a way to remove a single item from all_combines?
-def all_combines_minus_extload : GICombineGroup<[trivial_combines,
-  ptr_add_immed_chain, combine_indexed_load_store, undef_combines,
-  identity_combines]
->;
-
 def AMDGPUPostLegalizerCombinerHelper: GICombinerHelper<
   "AMDGPUGenPostLegalizerCombinerHelper",
-  [all_combines_minus_extload, gfx6gfx7_combines,
+  [all_combines, gfx6gfx7_combines,
    uchar_to_float, cvt_f32_ubyteN]> {
   let DisableRuleOption = "amdgpupostlegalizercombiner-disable-rule";
 }