[PATCH] D150790: [GlobalIsel][X86] fix legalization of G_CTLZ and GTCTPOP

[Thorsten via Phabricator via llvm-commits]

tschuett created this revision.
Herald added subscribers: pengfei, hiraditya.
Herald added a project: All.
tschuett requested review of this revision.
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.

Note that the builders are protected by is64Bit().

More fine-grained availibility checks.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D150790

Files:
  llvm/lib/Target/X86/X86LegalizerInfo.cpp
  llvm/test/CodeGen/X86/GlobalISel/legalize-ctpop.mir
  llvm/test/CodeGen/X86/GlobalISel/legalize-leading-zeros.mir


Index: llvm/test/CodeGen/X86/GlobalISel/legalize-leading-zeros.mir
===================================================================
--- llvm/test/CodeGen/X86/GlobalISel/legalize-leading-zeros.mir
+++ llvm/test/CodeGen/X86/GlobalISel/legalize-leading-zeros.mir
@@ -1,5 +1,5 @@
 # NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py UTC_ARGS: --version 2
-# RUN: llc -mtriple=x86_64-linux-gnu -mattr=+sse4.2 -run-pass=legalizer %s -o - | FileCheck %s
+# RUN: llc -mtriple=x86_64-linux-gnu -mattr=+lzcnt -run-pass=legalizer %s -o - | FileCheck %s
 
 # test count leading zeros for s16, s32, and s64
 
Index: llvm/test/CodeGen/X86/GlobalISel/legalize-ctpop.mir
===================================================================
--- llvm/test/CodeGen/X86/GlobalISel/legalize-ctpop.mir
+++ llvm/test/CodeGen/X86/GlobalISel/legalize-ctpop.mir
@@ -1,5 +1,5 @@
 # NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py UTC_ARGS: --version 2
-# RUN: llc -mtriple=x86_64-linux-gnu -mattr=+sse4.2 -run-pass=legalizer %s -o - | FileCheck %s
+# RUN: llc -mtriple=x86_64-linux-gnu -mattr=+popcnt -run-pass=legalizer %s -o - | FileCheck %s
 
 # test popcount for s16, s32, and s64
 
Index: llvm/lib/Target/X86/X86LegalizerInfo.cpp
===================================================================
--- llvm/lib/Target/X86/X86LegalizerInfo.cpp
+++ llvm/lib/Target/X86/X86LegalizerInfo.cpp
@@ -287,6 +287,23 @@
                        LegacyLegalizeActions::Legal);
   LegacyInfo.setAction({G_MERGE_VALUES, 1, s128}, LegacyLegalizeActions::Legal);
   LegacyInfo.setAction({G_UNMERGE_VALUES, s128}, LegacyLegalizeActions::Legal);
+
+  if (Subtarget.hasPOPCNT()) {
+    // popcount
+    getActionDefinitionsBuilder(G_CTPOP)
+      .legalFor({{s16, s16}, {s32, s32}, {s64, s64}})
+      .widenScalarToNextPow2(1, /*Min=*/16)
+      .clampScalar(1, s16, s64);
+  }
+
+  if (Subtarget.hasLZCNT()) {
+    // count leading zeros (LZCNT)
+    getActionDefinitionsBuilder(G_CTLZ)
+      .legalFor({{s16, s16}, {s32, s32}, {s64, s64}})
+      .widenScalarToNextPow2(1, /*Min=*/16)
+      .clampScalar(1, s16, s64);
+  }
+
 }
 
 void X86LegalizerInfo::setLegalizerInfoSSE1() {
@@ -389,21 +406,6 @@
   if (!Subtarget.hasSSE42())
     return;
 
-  const LLT s16 = LLT::scalar(16);
-  const LLT s32 = LLT::scalar(32);
-  const LLT s64 = LLT::scalar(64);
-
-  // popcount
-  getActionDefinitionsBuilder(G_CTPOP)
-    .legalFor({{s16, s16}, {s32, s32}, {s64, s64}})
-    .widenScalarToNextPow2(1, /*Min=*/16)
-    .clampScalar(1, s16, s64);
-
-  // count leading zeros (LZCNT)
-  getActionDefinitionsBuilder(G_CTLZ)
-    .legalFor({{s16, s16}, {s32, s32}, {s64, s64}})
-    .widenScalarToNextPow2(1, /*Min=*/16)
-    .clampScalar(1, s16, s64);
 }
 
 void X86LegalizerInfo::setLegalizerInfoAVX() {


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D150790.523064.patch
Type: text/x-patch
Size: 2813 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20230517/4e7f0e2e/attachment.bin>