[llvm] 59beb1e - Revert "[GlobalISel] Combine zext(trunc x) to x"
Nico Weber via llvm-commits
llvm-commits at lists.llvm.org
Thu Mar 4 07:13:56 PST 2021
Author: Nico Weber
Date: 2021-03-04T10:13:40-05:00
New Revision: 59beb1ef6d759eb63422507e8e8488502bcb62d8
URL: https://github.com/llvm/llvm-project/commit/59beb1ef6d759eb63422507e8e8488502bcb62d8
DIFF: https://github.com/llvm/llvm-project/commit/59beb1ef6d759eb63422507e8e8488502bcb62d8.diff
LOG: Revert "[GlobalISel] Combine zext(trunc x) to x"
This reverts commit 4112299ee761a9b6a309c8ff4a7e75f8c8d8851b.
Seems to depend on 4c8fb7ddd6fa49258e0e9427e7345fb56ba522d4 which
is being reverted.
Added:
Modified:
llvm/include/llvm/CodeGen/GlobalISel/CombinerHelper.h
llvm/include/llvm/Target/GlobalISel/Combine.td
llvm/lib/CodeGen/GlobalISel/CombinerHelper.cpp
llvm/test/CodeGen/AMDGPU/GlobalISel/shl-ext-reduce.ll
Removed:
llvm/test/CodeGen/AMDGPU/GlobalISel/combine-zext-trunc.mir
################################################################################
diff --git a/llvm/include/llvm/CodeGen/GlobalISel/CombinerHelper.h b/llvm/include/llvm/CodeGen/GlobalISel/CombinerHelper.h
index 71c7e7aab96a..3ae7cb8ea67c 100644
--- a/llvm/include/llvm/CodeGen/GlobalISel/CombinerHelper.h
+++ b/llvm/include/llvm/CodeGen/GlobalISel/CombinerHelper.h
@@ -316,9 +316,6 @@ class CombinerHelper {
bool matchCombineAnyExtTrunc(MachineInstr &MI, Register &Reg);
bool applyCombineAnyExtTrunc(MachineInstr &MI, Register &Reg);
- /// Transform zext(trunc(x)) to x.
- bool matchCombineZextTrunc(MachineInstr &MI, Register &Reg);
-
/// Transform [asz]ext([asz]ext(x)) to [asz]ext x.
bool matchCombineExtOfExt(MachineInstr &MI,
std::tuple<Register, unsigned> &MatchInfo);
diff --git a/llvm/include/llvm/Target/GlobalISel/Combine.td b/llvm/include/llvm/Target/GlobalISel/Combine.td
index 56c0a024b5b3..82e468759858 100644
--- a/llvm/include/llvm/Target/GlobalISel/Combine.td
+++ b/llvm/include/llvm/Target/GlobalISel/Combine.td
@@ -427,16 +427,6 @@ def anyext_trunc_fold: GICombineRule <
(apply [{ return Helper.replaceSingleDefInstWithReg(*${root}, ${matchinfo}); }])
>;
-// Fold (zext (trunc x)) -> x if the source type is same as the destination type
-// and truncated bits are known to be zero.
-def zext_trunc_fold_matchinfo : GIDefMatchData<"Register">;
-def zext_trunc_fold: GICombineRule <
- (defs root:$root, zext_trunc_fold_matchinfo:$matchinfo),
- (match (wip_match_opcode G_ZEXT):$root,
- [{ return Helper.matchCombineZextTrunc(*${root}, ${matchinfo}); }]),
- (apply [{ return Helper.replaceSingleDefInstWithReg(*${root}, ${matchinfo}); }])
->;
-
// Fold ([asz]ext ([asz]ext x)) -> ([asz]ext x).
def ext_ext_fold_matchinfo : GIDefMatchData<"std::tuple<Register, unsigned>">;
def ext_ext_fold: GICombineRule <
@@ -593,8 +583,7 @@ def identity_combines : GICombineGroup<[select_same_val, right_identity_zero,
def const_combines : GICombineGroup<[constant_fp_op, const_ptradd_to_i2p]>;
def known_bits_simplifications : GICombineGroup<[
- redundant_and, redundant_sext_inreg, redundant_or, urem_pow2_to_mask,
- zext_trunc_fold]>;
+ redundant_and, redundant_sext_inreg, redundant_or, urem_pow2_to_mask]>;
def width_reduction_combines : GICombineGroup<[reduce_shl_of_extend]>;
diff --git a/llvm/lib/CodeGen/GlobalISel/CombinerHelper.cpp b/llvm/lib/CodeGen/GlobalISel/CombinerHelper.cpp
index 8cad92c659b5..bf344f3fdf4a 100644
--- a/llvm/lib/CodeGen/GlobalISel/CombinerHelper.cpp
+++ b/llvm/lib/CodeGen/GlobalISel/CombinerHelper.cpp
@@ -2295,20 +2295,6 @@ bool CombinerHelper::matchCombineAnyExtTrunc(MachineInstr &MI, Register &Reg) {
m_GTrunc(m_all_of(m_Reg(Reg), m_SpecificType(DstTy))));
}
-bool CombinerHelper::matchCombineZextTrunc(MachineInstr &MI, Register &Reg) {
- assert(MI.getOpcode() == TargetOpcode::G_ZEXT && "Expected a G_ZEXT");
- Register DstReg = MI.getOperand(0).getReg();
- Register SrcReg = MI.getOperand(1).getReg();
- LLT DstTy = MRI.getType(DstReg);
- if (mi_match(SrcReg, MRI,
- m_GTrunc(m_all_of(m_Reg(Reg), m_SpecificType(DstTy))))) {
- unsigned DstSize = DstTy.getScalarSizeInBits();
- unsigned SrcSize = MRI.getType(SrcReg).getScalarSizeInBits();
- return KB->getKnownBits(Reg).countMinLeadingZeros() >= DstSize - SrcSize;
- }
- return false;
-}
-
bool CombinerHelper::matchCombineExtOfExt(
MachineInstr &MI, std::tuple<Register, unsigned> &MatchInfo) {
assert((MI.getOpcode() == TargetOpcode::G_ANYEXT ||
diff --git a/llvm/test/CodeGen/AMDGPU/GlobalISel/combine-zext-trunc.mir b/llvm/test/CodeGen/AMDGPU/GlobalISel/combine-zext-trunc.mir
deleted file mode 100644
index 99024987a2a3..000000000000
--- a/llvm/test/CodeGen/AMDGPU/GlobalISel/combine-zext-trunc.mir
+++ /dev/null
@@ -1,198 +0,0 @@
-# NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py
-# RUN: llc -mtriple=amdgcn-mesa-mesa3d -mcpu=gfx1010 -run-pass=amdgpu-prelegalizer-combiner -verify-machineinstrs %s -o - | FileCheck -check-prefix=GCN %s
-
----
-name: zext_trunc_s32_s16_s32
-tracksRegLiveness: true
-body: |
- bb.0:
- liveins: $vgpr0
-
- ; GCN-LABEL: name: zext_trunc_s32_s16_s32
- ; GCN: liveins: $vgpr0
- ; GCN: %var:_(s32) = COPY $vgpr0
- ; GCN: %c3FFF:_(s32) = G_CONSTANT i32 16383
- ; GCN: %low_bits:_(s32) = G_AND %var, %c3FFF
- ; GCN: $vgpr0 = COPY %low_bits(s32)
- %var:_(s32) = COPY $vgpr0
- %c3FFF:_(s32) = G_CONSTANT i32 16383
- %low_bits:_(s32) = G_AND %var, %c3FFF
- %trunc:_(s16) = G_TRUNC %low_bits(s32)
- %zext:_(s32) = G_ZEXT %trunc(s16)
- $vgpr0 = COPY %zext(s32)
-...
-
----
-name: zext_trunc_s32_s16_s32_unknown_high_bits
-tracksRegLiveness: true
-body: |
- bb.0:
- liveins: $vgpr0
-
- ; GCN-LABEL: name: zext_trunc_s32_s16_s32_unknown_high_bits
- ; GCN: liveins: $vgpr0
- ; GCN: %var:_(s32) = COPY $vgpr0
- ; GCN: %cFFFFF:_(s32) = G_CONSTANT i32 1048575
- ; GCN: %low_bits:_(s32) = G_AND %var, %cFFFFF
- ; GCN: %trunc:_(s16) = G_TRUNC %low_bits(s32)
- ; GCN: %zext:_(s32) = G_ZEXT %trunc(s16)
- ; GCN: $vgpr0 = COPY %zext(s32)
- %var:_(s32) = COPY $vgpr0
- %cFFFFF:_(s32) = G_CONSTANT i32 1048575
- %low_bits:_(s32) = G_AND %var, %cFFFFF
- %trunc:_(s16) = G_TRUNC %low_bits(s32)
- %zext:_(s32) = G_ZEXT %trunc(s16)
- $vgpr0 = COPY %zext(s32)
-...
-
----
-name: zext_trunc_s64_s16_s32
-tracksRegLiveness: true
-body: |
- bb.0:
- liveins: $vgpr0_vgpr1
-
- ; GCN-LABEL: name: zext_trunc_s64_s16_s32
- ; GCN: liveins: $vgpr0_vgpr1
- ; GCN: %var:_(s64) = COPY $vgpr0_vgpr1
- ; GCN: %c3FFF:_(s64) = G_CONSTANT i64 16383
- ; GCN: %low_bits:_(s64) = G_AND %var, %c3FFF
- ; GCN: %trunc:_(s16) = G_TRUNC %low_bits(s64)
- ; GCN: %zext:_(s32) = G_ZEXT %trunc(s16)
- ; GCN: $vgpr0 = COPY %zext(s32)
- %var:_(s64) = COPY $vgpr0_vgpr1
- %c3FFF:_(s64) = G_CONSTANT i64 16383
- %low_bits:_(s64) = G_AND %var, %c3FFF
- %trunc:_(s16) = G_TRUNC %low_bits(s64)
- %zext:_(s32) = G_ZEXT %trunc(s16)
- $vgpr0 = COPY %zext(s32)
-...
-
----
-name: zext_trunc_s32_s16_s64
-tracksRegLiveness: true
-body: |
- bb.0:
- liveins: $vgpr0
-
- ; GCN-LABEL: name: zext_trunc_s32_s16_s64
- ; GCN: liveins: $vgpr0
- ; GCN: %var:_(s32) = COPY $vgpr0
- ; GCN: %c3FFF:_(s32) = G_CONSTANT i32 16383
- ; GCN: %low_bits:_(s32) = G_AND %var, %c3FFF
- ; GCN: %trunc:_(s16) = G_TRUNC %low_bits(s32)
- ; GCN: %zext:_(s64) = G_ZEXT %trunc(s16)
- ; GCN: $vgpr0_vgpr1 = COPY %zext(s64)
- %var:_(s32) = COPY $vgpr0
- %c3FFF:_(s32) = G_CONSTANT i32 16383
- %low_bits:_(s32) = G_AND %var, %c3FFF
- %trunc:_(s16) = G_TRUNC %low_bits(s32)
- %zext:_(s64) = G_ZEXT %trunc(s16)
- $vgpr0_vgpr1 = COPY %zext(s64)
-...
-
----
-name: zext_trunc_v2s32_v2s16_v2s32
-tracksRegLiveness: true
-body: |
- bb.0:
- liveins: $vgpr0_vgpr1
-
- ; GCN-LABEL: name: zext_trunc_v2s32_v2s16_v2s32
- ; GCN: liveins: $vgpr0_vgpr1
- ; GCN: %var:_(<2 x s32>) = COPY $vgpr0_vgpr1
- ; GCN: %c3FFF:_(s32) = G_CONSTANT i32 16383
- ; GCN: %c7FFF:_(s32) = G_CONSTANT i32 32767
- ; GCN: %c:_(<2 x s32>) = G_BUILD_VECTOR %c3FFF(s32), %c7FFF(s32)
- ; GCN: %low_bits:_(<2 x s32>) = G_AND %var, %c
- ; GCN: $vgpr0_vgpr1 = COPY %low_bits(<2 x s32>)
- %var:_(<2 x s32>) = COPY $vgpr0_vgpr1
- %c3FFF:_(s32) = G_CONSTANT i32 16383
- %c7FFF:_(s32) = G_CONSTANT i32 32767
- %c:_(<2 x s32>) = G_BUILD_VECTOR %c3FFF(s32), %c7FFF(s32)
- %low_bits:_(<2 x s32>) = G_AND %var, %c
- %trunc:_(<2 x s16>) = G_TRUNC %low_bits(<2 x s32>)
- %zext:_(<2 x s32>) = G_ZEXT %trunc(<2 x s16>)
- $vgpr0_vgpr1 = COPY %zext(<2 x s32>)
-...
-
----
-name: zext_trunc_v2s32_v2s16_v2s32_unknown_high_bits
-tracksRegLiveness: true
-body: |
- bb.0:
- liveins: $vgpr0_vgpr1
-
- ; GCN-LABEL: name: zext_trunc_v2s32_v2s16_v2s32_unknown_high_bits
- ; GCN: liveins: $vgpr0_vgpr1
- ; GCN: %var:_(<2 x s32>) = COPY $vgpr0_vgpr1
- ; GCN: %cFFFFF:_(s32) = G_CONSTANT i32 1048575
- ; GCN: %c7FFF:_(s32) = G_CONSTANT i32 32767
- ; GCN: %c:_(<2 x s32>) = G_BUILD_VECTOR %cFFFFF(s32), %c7FFF(s32)
- ; GCN: %low_bits:_(<2 x s32>) = G_AND %var, %c
- ; GCN: %trunc:_(<2 x s16>) = G_TRUNC %low_bits(<2 x s32>)
- ; GCN: %zext:_(<2 x s32>) = G_ZEXT %trunc(<2 x s16>)
- ; GCN: $vgpr0_vgpr1 = COPY %zext(<2 x s32>)
- %var:_(<2 x s32>) = COPY $vgpr0_vgpr1
- %cFFFFF:_(s32) = G_CONSTANT i32 1048575
- %c7FFF:_(s32) = G_CONSTANT i32 32767
- %c:_(<2 x s32>) = G_BUILD_VECTOR %cFFFFF(s32), %c7FFF(s32)
- %low_bits:_(<2 x s32>) = G_AND %var, %c
- %trunc:_(<2 x s16>) = G_TRUNC %low_bits(<2 x s32>)
- %zext:_(<2 x s32>) = G_ZEXT %trunc(<2 x s16>)
- $vgpr0_vgpr1 = COPY %zext(<2 x s32>)
-...
-
----
-name: zext_trunc_v2s64_v2s16_v2s32
-tracksRegLiveness: true
-body: |
- bb.0:
- liveins: $vgpr0_vgpr1_vgpr2_vgpr3
-
- ; GCN-LABEL: name: zext_trunc_v2s64_v2s16_v2s32
- ; GCN: liveins: $vgpr0_vgpr1_vgpr2_vgpr3
- ; GCN: %var:_(<2 x s64>) = COPY $vgpr0_vgpr1_vgpr2_vgpr3
- ; GCN: %c3FFF:_(s64) = G_CONSTANT i64 16383
- ; GCN: %c7FFF:_(s64) = G_CONSTANT i64 32767
- ; GCN: %c:_(<2 x s64>) = G_BUILD_VECTOR %c3FFF(s64), %c7FFF(s64)
- ; GCN: %low_bits:_(<2 x s64>) = G_AND %var, %c
- ; GCN: %trunc:_(<2 x s16>) = G_TRUNC %low_bits(<2 x s64>)
- ; GCN: %zext:_(<2 x s32>) = G_ZEXT %trunc(<2 x s16>)
- ; GCN: $vgpr0_vgpr1 = COPY %zext(<2 x s32>)
- %var:_(<2 x s64>) = COPY $vgpr0_vgpr1_vgpr2_vgpr3
- %c3FFF:_(s64) = G_CONSTANT i64 16383
- %c7FFF:_(s64) = G_CONSTANT i64 32767
- %c:_(<2 x s64>) = G_BUILD_VECTOR %c3FFF(s64), %c7FFF(s64)
- %low_bits:_(<2 x s64>) = G_AND %var, %c
- %trunc:_(<2 x s16>) = G_TRUNC %low_bits(<2 x s64>)
- %zext:_(<2 x s32>) = G_ZEXT %trunc(<2 x s16>)
- $vgpr0_vgpr1 = COPY %zext(<2 x s32>)
-...
-
----
-name: zext_trunc_v2s32_v2s16_v2s64
-tracksRegLiveness: true
-body: |
- bb.0:
- liveins: $vgpr0_vgpr1
-
- ; GCN-LABEL: name: zext_trunc_v2s32_v2s16_v2s64
- ; GCN: liveins: $vgpr0_vgpr1
- ; GCN: %var:_(<2 x s32>) = COPY $vgpr0_vgpr1
- ; GCN: %c3FFF:_(s32) = G_CONSTANT i32 16383
- ; GCN: %c7FFF:_(s32) = G_CONSTANT i32 32767
- ; GCN: %c:_(<2 x s32>) = G_BUILD_VECTOR %c3FFF(s32), %c7FFF(s32)
- ; GCN: %low_bits:_(<2 x s32>) = G_AND %var, %c
- ; GCN: %trunc:_(<2 x s16>) = G_TRUNC %low_bits(<2 x s32>)
- ; GCN: %zext:_(<2 x s64>) = G_ZEXT %trunc(<2 x s16>)
- ; GCN: $vgpr0_vgpr1_vgpr2_vgpr3 = COPY %zext(<2 x s64>)
- %var:_(<2 x s32>) = COPY $vgpr0_vgpr1
- %c3FFF:_(s32) = G_CONSTANT i32 16383
- %c7FFF:_(s32) = G_CONSTANT i32 32767
- %c:_(<2 x s32>) = G_BUILD_VECTOR %c3FFF(s32), %c7FFF(s32)
- %low_bits:_(<2 x s32>) = G_AND %var, %c
- %trunc:_(<2 x s16>) = G_TRUNC %low_bits(<2 x s32>)
- %zext:_(<2 x s64>) = G_ZEXT %trunc(<2 x s16>)
- $vgpr0_vgpr1_vgpr2_vgpr3 = COPY %zext(<2 x s64>)
-...
diff --git a/llvm/test/CodeGen/AMDGPU/GlobalISel/shl-ext-reduce.ll b/llvm/test/CodeGen/AMDGPU/GlobalISel/shl-ext-reduce.ll
index f47a3de86453..b3d374dfe5e4 100644
--- a/llvm/test/CodeGen/AMDGPU/GlobalISel/shl-ext-reduce.ll
+++ b/llvm/test/CodeGen/AMDGPU/GlobalISel/shl-ext-reduce.ll
@@ -404,14 +404,18 @@ define amdgpu_ps i32 @s_shl_i32_zext_i16(i16 inreg %x) {
; GFX8: ; %bb.0:
; GFX8-NEXT: s_and_b32 s0, s0, 0xffff
; GFX8-NEXT: s_and_b32 s0, s0, 0x3fff
-; GFX8-NEXT: s_lshl_b32 s0, s0, 2
+; GFX8-NEXT: s_bfe_u32 s1, 2, 0x100000
+; GFX8-NEXT: s_lshl_b32 s0, s0, s1
+; GFX8-NEXT: s_bfe_u32 s0, s0, 0x100000
; GFX8-NEXT: ; return to shader part epilog
;
; GFX9-LABEL: s_shl_i32_zext_i16:
; GFX9: ; %bb.0:
; GFX9-NEXT: s_and_b32 s0, s0, 0xffff
; GFX9-NEXT: s_and_b32 s0, s0, 0x3fff
-; GFX9-NEXT: s_lshl_b32 s0, s0, 2
+; GFX9-NEXT: s_bfe_u32 s1, 2, 0x100000
+; GFX9-NEXT: s_lshl_b32 s0, s0, s1
+; GFX9-NEXT: s_bfe_u32 s0, s0, 0x100000
; GFX9-NEXT: ; return to shader part epilog
%and = and i16 %x, 16383
%ext = zext i16 %and to i32
@@ -460,10 +464,13 @@ define amdgpu_ps <2 x i32> @s_shl_v2i32_zext_v2i16(<2 x i16> inreg %x) {
; GFX8-LABEL: s_shl_v2i32_zext_v2i16:
; GFX8: ; %bb.0:
; GFX8-NEXT: s_movk_i32 s2, 0x3fff
+; GFX8-NEXT: s_mov_b32 s4, 0xffff
; GFX8-NEXT: s_lshr_b32 s1, s0, 16
; GFX8-NEXT: s_mov_b32 s3, s2
-; GFX8-NEXT: s_and_b32 s0, s0, 0xffff
+; GFX8-NEXT: s_and_b32 s0, s0, s4
; GFX8-NEXT: s_and_b64 s[0:1], s[0:1], s[2:3]
+; GFX8-NEXT: s_mov_b32 s5, s4
+; GFX8-NEXT: s_and_b64 s[0:1], s[0:1], s[4:5]
; GFX8-NEXT: s_lshl_b32 s0, s0, 2
; GFX8-NEXT: s_lshl_b32 s1, s1, 2
; GFX8-NEXT: ; return to shader part epilog
More information about the llvm-commits
mailing list