Revert "[GlobalIsel][X86] Legalize G_CTPOP and G_CTLZ"

This reverts commit ef1f27d.

Author: tschuett

llvm/lib/Target/X86/X86LegalizerInfo.cpp

@@ -65,7 +65,6 @@ X86LegalizerInfo::X86LegalizerInfo(const X86Subtarget &STI,
   setLegalizerInfoSSE1();
   setLegalizerInfoSSE2();
   setLegalizerInfoSSE41();
-  setLegalizerInfoSSE42();
   setLegalizerInfoAVX();
   setLegalizerInfoAVX2();
   setLegalizerInfoAVX512();
@@ -287,10 +286,6 @@ void X86LegalizerInfo::setLegalizerInfo64bit() {
                        LegacyLegalizeActions::Legal);
   LegacyInfo.setAction({G_MERGE_VALUES, 1, s128}, LegacyLegalizeActions::Legal);
   LegacyInfo.setAction({G_UNMERGE_VALUES, s128}, LegacyLegalizeActions::Legal);
-  getActionDefinitionsBuilder(G_BSWAP)
-    .legalFor({s32, s64})
-    .widenScalarToNextPow2(1, /*Min=*/32)
-    .clampScalar(0, s32, s64);
 }
 
 void X86LegalizerInfo::setLegalizerInfoSSE1() {
@@ -389,28 +384,6 @@ void X86LegalizerInfo::setLegalizerInfoSSE41() {
   LegacyInfo.setAction({G_MUL, v4s32}, LegacyLegalizeActions::Legal);
 }
 
-void X86LegalizerInfo::setLegalizerInfoSSE42() {
-  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() {
   if (!Subtarget.hasAVX())
     return;

llvm/lib/Target/X86/X86LegalizerInfo.h

@@ -41,7 +41,6 @@ class X86LegalizerInfo : public LegalizerInfo {
   void setLegalizerInfoSSE1();
   void setLegalizerInfoSSE2();
   void setLegalizerInfoSSE41();
-  void setLegalizerInfoSSE42();
   void setLegalizerInfoAVX();
   void setLegalizerInfoAVX2();
   void setLegalizerInfoAVX512();

llvm/test/CodeGen/X86/GlobalISel/legalize-bswap.mir

@@ -19,30 +19,30 @@ body:             |
   bb.1 (%ir-block.0):
     ; X32-LABEL: name: test_constant
     ; X32: [[C:%[0-9]+]]:_(s32) = G_CONSTANT i32 1
-    ; X32-NEXT: $eax = COPY [[C]](s32)
-    ; X32-NEXT: [[C1:%[0-9]+]]:_(s8) = G_CONSTANT i8 8
-    ; X32-NEXT: $al = COPY [[C1]](s8)
-    ; X32-NEXT: [[C2:%[0-9]+]]:_(s16) = G_CONSTANT i16 16
-    ; X32-NEXT: $ax = COPY [[C2]](s16)
-    ; X32-NEXT: [[C3:%[0-9]+]]:_(s32) = G_CONSTANT i32 32
-    ; X32-NEXT: $eax = COPY [[C3]](s32)
-    ; X32-NEXT: [[C4:%[0-9]+]]:_(s32) = G_CONSTANT i32 64
-    ; X32-NEXT: [[C5:%[0-9]+]]:_(s32) = G_CONSTANT i32 0
-    ; X32-NEXT: [[MV:%[0-9]+]]:_(s64) = G_MERGE_VALUES [[C4]](s32), [[C5]](s32)
-    ; X32-NEXT: $rax = COPY [[MV]](s64)
-    ; X32-NEXT: RET 0
+    ; X32: $eax = COPY [[C]](s32)
+    ; X32: [[C1:%[0-9]+]]:_(s8) = G_CONSTANT i8 8
+    ; X32: $al = COPY [[C1]](s8)
+    ; X32: [[C2:%[0-9]+]]:_(s16) = G_CONSTANT i16 16
+    ; X32: $ax = COPY [[C2]](s16)
+    ; X32: [[C3:%[0-9]+]]:_(s32) = G_CONSTANT i32 32
+    ; X32: $eax = COPY [[C3]](s32)
+    ; X32: [[C4:%[0-9]+]]:_(s32) = G_CONSTANT i32 64
+    ; X32: [[C5:%[0-9]+]]:_(s32) = G_CONSTANT i32 0
+    ; X32: [[MV:%[0-9]+]]:_(s64) = G_MERGE_VALUES [[C4]](s32), [[C5]](s32)
+    ; X32: $rax = COPY [[MV]](s64)
+    ; X32: RET 0
     ; X64-LABEL: name: test_constant
     ; X64: [[C:%[0-9]+]]:_(s32) = G_CONSTANT i32 1
-    ; X64-NEXT: $eax = COPY [[C]](s32)
-    ; X64-NEXT: [[C1:%[0-9]+]]:_(s8) = G_CONSTANT i8 8
-    ; X64-NEXT: $al = COPY [[C1]](s8)
-    ; X64-NEXT: [[C2:%[0-9]+]]:_(s16) = G_CONSTANT i16 16
-    ; X64-NEXT: $ax = COPY [[C2]](s16)
-    ; X64-NEXT: [[C3:%[0-9]+]]:_(s32) = G_CONSTANT i32 32
-    ; X64-NEXT: $eax = COPY [[C3]](s32)
-    ; X64-NEXT: [[C4:%[0-9]+]]:_(s64) = G_CONSTANT i64 64
-    ; X64-NEXT: $rax = COPY [[C4]](s64)
-    ; X64-NEXT: RET 0
+    ; X64: $eax = COPY [[C]](s32)
+    ; X64: [[C1:%[0-9]+]]:_(s8) = G_CONSTANT i8 8
+    ; X64: $al = COPY [[C1]](s8)
+    ; X64: [[C2:%[0-9]+]]:_(s16) = G_CONSTANT i16 16
+    ; X64: $ax = COPY [[C2]](s16)
+    ; X64: [[C3:%[0-9]+]]:_(s32) = G_CONSTANT i32 32
+    ; X64: $eax = COPY [[C3]](s32)
+    ; X64: [[C4:%[0-9]+]]:_(s64) = G_CONSTANT i64 64
+    ; X64: $rax = COPY [[C4]](s64)
+    ; X64: RET 0
     %0(s1) = G_CONSTANT i1 1
     %5:_(s32) = G_ANYEXT %0
     $eax = COPY %5
@@ -71,14 +71,14 @@ body: |
 
     ; X32-LABEL: name: test_fconstant
     ; X32: [[C:%[0-9]+]]:_(s32) = G_FCONSTANT float 1.000000e+00
-    ; X32-NEXT: $eax = COPY [[C]](s32)
-    ; X32-NEXT: [[C1:%[0-9]+]]:_(s64) = G_FCONSTANT double 2.000000e+00
-    ; X32-NEXT: $rax = COPY [[C1]](s64)
+    ; X32: $eax = COPY [[C]](s32)
+    ; X32: [[C1:%[0-9]+]]:_(s64) = G_FCONSTANT double 2.000000e+00
+    ; X32: $rax = COPY [[C1]](s64)
     ; X64-LABEL: name: test_fconstant
     ; X64: [[C:%[0-9]+]]:_(s32) = G_FCONSTANT float 1.000000e+00
-    ; X64-NEXT: $eax = COPY [[C]](s32)
-    ; X64-NEXT: [[C1:%[0-9]+]]:_(s64) = G_FCONSTANT double 2.000000e+00
-    ; X64-NEXT: $rax = COPY [[C1]](s64)
+    ; X64: $eax = COPY [[C]](s32)
+    ; X64: [[C1:%[0-9]+]]:_(s64) = G_FCONSTANT double 2.000000e+00
+    ; X64: $rax = COPY [[C1]](s64)
     %0(s32) = G_FCONSTANT float 1.0
     $eax = COPY %0
     %1(s64) = G_FCONSTANT double 2.0