[X86][GISel] Unify AVX/AVX2 and AVX512/AVX512BW type legality

Merge AVX2 types into AVX and AVX512BW types into AVX512, since the vector
types are valid in both cases.

Author: bonsthie

llvm/lib/Target/X86/GISel/X86LegalizerInfo.cpp

@@ -93,21 +93,19 @@ X86LegalizerInfo::X86LegalizerInfo(const X86Subtarget &STI,
       .legalFor({p0, s1, s8, s16, s32, s64})
       .legalFor(Is64Bit, {s128})
       .legalFor(HasSSE2, {v16s8, v8s16, v4s32, v2s64})
-      .legalFor(HasAVX, {v8s32, v4s64})
-      .legalFor(HasAVX2, {v32s8, v16s16, v8s32, v4s64})
-      .legalFor(HasAVX512, {v16s32, v8s64})
-      .legalFor(HasBWI, {v64s8, v32s16})
+      .legalFor(HasAVX, {v32s8, v16s16, v8s32, v4s64})
+      .legalFor(HasAVX512, {v64s8, v32s16, v16s32, v8s64})
       .widenScalarOrEltToNextPow2(0, /*Min=*/8)
       .clampScalarOrElt(0, s8, sMaxScalar)
       .moreElementsToNextPow2(0)
       .clampMinNumElements(0, s8, 16)
       .clampMinNumElements(0, s16, 8)
       .clampMinNumElements(0, s32, 4)
       .clampMinNumElements(0, s64, 2)
-      .clampMaxNumElements(0, s8, HasBWI ? 64 : (HasAVX2 ? 32 : 16))
-      .clampMaxNumElements(0, s16, HasBWI ? 32 : (HasAVX2 ? 16 : 8))
-      .clampMaxNumElements(0, s32, HasAVX512 ? 16 : (HasAVX2 ? 8 : 4))
-      .clampMaxNumElements(0, s64, HasAVX512 ? 8 : (HasAVX2 ? 4 : 2))
+      .clampMaxNumElements(0, s8, HasAVX512 ? 64 : (HasAVX ? 32 : 16))
+      .clampMaxNumElements(0, s16, HasAVX512  ? 32 : (HasAVX ? 16 : 8))
+      .clampMaxNumElements(0, s32, HasAVX512 ? 16 : (HasAVX ? 8 : 4))
+      .clampMaxNumElements(0, s64, HasAVX512 ? 8 : (HasAVX ? 4 : 2))
       .clampMaxNumElements(0, p0,
                            Is64Bit ? s64MaxVector.getNumElements()
                                    : s32MaxVector.getNumElements())