From 9e8d59a9b81ec152e33881ed5bd3aa07ac805db0 Mon Sep 17 00:00:00 2001 From: Matt Arsenault Date: Wed, 19 Aug 2020 13:59:11 -0400 Subject: [PATCH] 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. --- llvm/lib/Target/AMDGPU/AMDGPUCombine.td | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/llvm/lib/Target/AMDGPU/AMDGPUCombine.td b/llvm/lib/Target/AMDGPU/AMDGPUCombine.td index faaf916..d243074 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"; } -- 2.7.4