[PowerPC] Add support for vector bool __int128 for Power10

[saghir]

Summary

This patch adds support for vector bool __int128 type for Power10.

[amyk]

clang/test/Parser/p10-vector-bool-128.c

2

Just curious but does the RUN line require pwr10?

[lei]

clang/lib/Sema/DeclSpec.cpp

1155

Not sure what you mean here.

1167

I think you should only check for "power10-vector" since this requires pwr10?

clang/test/Parser/altivec-bool-128.c

3

test for -mcpu=pwr10 -target-feature -power10-vector and -mcpu=pwr10 -target-feature -vsx
same for cxx-altivec-bool-128.cpp

clang/test/Parser/p10-vector-bool-128.c

3

add run line for feature cpu=pwr10 +power10-vector

[saghir]

clang/lib/Sema/DeclSpec.cpp

1155

Earlier comment had the Programming Interface Manual version number (PIM 2.1); asserting only char/int were valid with vector bool.
This patch adds __int128, so the comment needs to be updated with the latest version of the document once it is available.

clang/test/Parser/altivec-bool-128.c

3

This test basically checks that VSX needs to be enabled to have vector bool __int128 type work.

clang/test/Parser/p10-vector-bool-128.c

2

Added pwr10.

3

Added pwr10.
vector bool __int128 type should work with pwr10 and vsx enabled, power10-vector is not needed explicitly.

[lei]

clang/test/Parser/altivec-bool-128.c

3

Yes. I am asking you to add a test to check that power10-vector is also needed to be enabled for this type to work.
eg. this type should not be enabled for -mcpu=pwr10 -target-feature +vsx -target-feature -power10-vector

clang/test/Parser/p10-vector-bool-128.c

3

cpu=pwr10 -vsx +power10-vector

[saghir]

Addressed comments.

[lei]

clang/lib/Sema/DeclSpec.cpp

1169

Do we not need to add a check for int128 to this check as well?

[lei]

clang/lib/Sema/DeclSpec.cpp

1155

Maybe need to add a TODO in all the sections of code, that you update, where it mentions PIM 2.1

[saghir]

Updated comment for allowing __int128 for vector bool.

[saghir]

Updated tests.

[saghir]

clang/lib/Sema/DeclSpec.cpp

1155

I have changed comment such that it does not need the document version.

clang/test/Parser/altivec-bool-128.c

3

Done, added a line for pwr10, +vsx and -power10-vector.

clang/test/Parser/p10-vector-bool-128.c

3

I have now added both -target-cpu pwr10 and -target-feature +power10-vector as you mentioned in the first comment.
However, I am not quite sure what you are looking to test here by adding -vsx because that would disable vsx, which in turn would disable power10-vector and we would not be able to test the legitimate use here.

[saghir]

clang/lib/Sema/DeclSpec.cpp

1169

No need here because this checks for type TST_int only.

[lei]

clang/test/Parser/p10-vector-bool-128.c

2

I don't think you need -target-feature +altivec here.

3

-vsx diable it, but the following +power10-vector should enable it.
So:

// RUN: %clang_cc1 -triple=powerpc64le-unknown-linux-gnu -target-cpu pwr10 \
// RUN:            -target-feature -vsx -target-feature +power10-vector

5

this line shouldn't be needed.

[saghir]

Updated tests features to check.

[saghir]

clang/test/Parser/p10-vector-bool-128.c

3

Sorry, I did not accurately explain what happens if we disable vsx.
We cannot enable power10-vector and disable vsx at the same time, well we can but the compiler would give the following error:
error: option '-mpower10-vector' cannot be specified with '-mno-vsx'

ppcUserFeaturesCheck function in PPC.cpp ensures that any vsx dependant option cannot be turned on while simultaneously disabling vsx. So for this reason the above test line that you mentioned would not work.

[saghir]

Updated comment to reflect the change in allowed types.

[saghir]

Updated comment.

[amyk]

Other than Lei's concerns, personally I think this looks good to me.

clang/test/Parser/p10-vector-bool-128.c

7

I believe this comment still needs to be addressed (of the line not being needed).

[saghir]

clang/test/Parser/p10-vector-bool-128.c

7

I think this was for a line removed earlier.

[lei]

LGTM, please address the 1 comment I have on commit.

clang/test/Parser/altivec-bool-128.c

7

I don't think this is needed here -target-feature +altivec

clang/include/clang/Basic/DiagnosticSemaKinds.td

def err_invalid_vector_bool_decl_spec : Error<
   "cannot use '%0' with '__vector bool'">;
 def err_invalid_vector_long_decl_spec : Error<
   "cannot use 'long' with '__vector'">;
 def err_invalid_vector_float_decl_spec : Error<
   "cannot use 'float' with '__vector'">;
 def err_invalid_vector_double_decl_spec : Error <
   "use of 'double' with '__vector' requires VSX support to be enabled "
   "(available on POWER7 or later)">;
+def err_invalid_vector_bool_int128_decl_spec : Error <
+  "use of '__int128' with '__vector bool' requires VSX support enabled (on "
+  "POWER10 or later)">;
 def err_invalid_vector_long_long_decl_spec : Error <
   "use of 'long long' with '__vector bool' requires VSX support (available on "
   "POWER7 or later) or extended Altivec support (available on POWER8 or later) "
   "to be enabled">;
 def err_invalid_vector_long_double_decl_spec : Error<
   "cannot use 'long double' with '__vector'">;
 def warn_vector_long_decl_spec_combination : Warning<
   "Use of 'long' with '__vector' is deprecated">, InGroup<Deprecated>;

clang/lib/Sema/DeclSpec.cpp

void DeclSpec::Finish(Sema &S, const PrintingPolicy &Policy) {
   if (TypeAltiVecVector) {
     if (TypeAltiVecBool) {
       // Sign specifiers are not allowed with vector bool. (PIM 2.1)
       if (TypeSpecSign != TSS_unspecified) {
         S.Diag(TSSLoc, diag::err_invalid_vector_bool_decl_spec)
           << getSpecifierName((TSS)TypeSpecSign);
       }
 
-      // Only char/int are valid with vector bool. (PIM 2.1)
+      // Power10 adds instructions that produce vector bool data
+      // for quadwords as well, so allow vector bool __int128.
+      // Only char/int/__int128 are valid with vector bool.
       if (((TypeSpecType != TST_unspecified) && (TypeSpecType != TST_char) &&
-           (TypeSpecType != TST_int)) || TypeAltiVecPixel) {
+           (TypeSpecType != TST_int) && (TypeSpecType != TST_int128)) ||
+          TypeAltiVecPixel) {
         S.Diag(TSTLoc, diag::err_invalid_vector_bool_decl_spec)
           << (TypeAltiVecPixel ? "__pixel" :
                                  getSpecifierName((TST)TypeSpecType, Policy));
       }
+      // vector bool __int128 requires Power10.
+      if ((TypeSpecType == TST_int128) &&
+          (!S.Context.getTargetInfo().hasFeature("power10-vector")))
+        S.Diag(TSTLoc, diag::err_invalid_vector_bool_int128_decl_spec);
 
       // Only 'short' and 'long long' are valid with vector bool. (PIM 2.1)
       if ((TypeSpecWidth != TSW_unspecified) && (TypeSpecWidth != TSW_short) &&
           (TypeSpecWidth != TSW_longlong))
         S.Diag(TSWRange.getBegin(), diag::err_invalid_vector_bool_decl_spec)
             << getSpecifierName((TSW)TypeSpecWidth);
 
       // vector bool long long requires VSX support or ZVector.
       if ((TypeSpecWidth == TSW_longlong) &&
           (!S.Context.getTargetInfo().hasFeature("vsx")) &&
           (!S.Context.getTargetInfo().hasFeature("power8-vector")) &&
           !S.getLangOpts().ZVector)
         S.Diag(TSTLoc, diag::err_invalid_vector_long_long_decl_spec);
 
       // Elements of vector bool are interpreted as unsigned. (PIM 2.1)
       if ((TypeSpecType == TST_char) || (TypeSpecType == TST_int) ||
-          (TypeSpecWidth != TSW_unspecified))
+          (TypeSpecType == TST_int128) || (TypeSpecWidth != TSW_unspecified))
         TypeSpecSign = TSS_unsigned;
     } else if (TypeSpecType == TST_double) {
       // vector long double and vector long long double are never allowed.
       // vector double is OK for Power7 and later, and ZVector.
       if (TypeSpecWidth == TSW_long || TypeSpecWidth == TSW_longlong)
         S.Diag(TSWRange.getBegin(),
                diag::err_invalid_vector_long_double_decl_spec);
       else if (!S.Context.getTargetInfo().hasFeature("vsx") &&

clang/test/Parser/altivec-bool-128.c

+// RUN: %clang_cc1 -triple=powerpc64-unknown-linux-gnu \
+// RUN:            -target-feature +altivec -fsyntax-only -verify %s
+// RUN: %clang_cc1 -triple=powerpc64le-unknown-linux-gnu \
+// RUN:            -target-feature +altivec -fsyntax-only -verify %s
+// RUN: %clang_cc1 -triple=powerpc64le-unknown-linux-gnu -target-cpu pwr10 \
+// RUN:            -target-feature +altivec -target-feature +vsx \
+// RUN:            -target-feature -power10-vector -fsyntax-only -verify %s
+
+
+
+// Test 'vector bool __int128' type.
+
+// These should have errors.
+__vector bool __int128 v1_bi128;          // expected-error {{use of '__int128' with '__vector bool' requires VSX support enabled (on POWER10 or later)}}
+__vector __bool __int128 v2_bi128;        // expected-error {{use of '__int128' with '__vector bool' requires VSX support enabled (on POWER10 or later)}}
+vector bool __int128 v3_bi128;            // expected-error {{use of '__int128' with '__vector bool' requires VSX support enabled (on POWER10 or later)}}
+vector __bool __int128 v4_bi128;          // expected-error {{use of '__int128' with '__vector bool' requires VSX support enabled (on POWER10 or later)}}
+__vector bool unsigned __int128 v5_bi128; // expected-error {{cannot use 'unsigned' with '__vector bool'}} expected-error {{use of '__int128' with '__vector bool' requires VSX support enabled (on POWER10 or later)}}
+__vector bool signed __int128 v6_bi128;   // expected-error {{cannot use 'signed' with '__vector bool'}} expected-error {{use of '__int128' with '__vector bool' requires VSX support enabled (on POWER10 or later)}}
+vector bool unsigned __int128 v7_bi128;   // expected-error {{cannot use 'unsigned' with '__vector bool'}} expected-error {{use of '__int128' with '__vector bool' requires VSX support enabled (on POWER10 or later)}}
+vector bool signed __int128 v8_bi128;     // expected-error {{cannot use 'signed' with '__vector bool'}} expected-error {{use of '__int128' with '__vector bool' requires VSX support enabled (on POWER10 or later)}}
+__vector __bool signed __int128 v9_bi128; // expected-error {{cannot use 'signed' with '__vector bool'}} expected-error {{use of '__int128' with '__vector bool' requires VSX support enabled (on POWER10 or later)}}
+vector __bool signed __int128 v10_bi128;  // expected-error {{cannot use 'signed' with '__vector bool'}} expected-error {{use of '__int128' with '__vector bool' requires VSX support enabled (on POWER10 or later)}}

clang/test/Parser/cxx-altivec-bool-128.cpp

+// RUN: %clang_cc1 -triple=powerpc64-unknown-linux-gnu \
+// RUN:            -target-feature +altivec -fsyntax-only -verify -std=c++11 %s
+// RUN: %clang_cc1 -triple=powerpc64le-unknown-linux-gnu \
+// RUN:            -target-feature +altivec -fsyntax-only -verify -std=c++11 %s
+// RUN: %clang_cc1 -triple=powerpc64le-unknown-linux-gnu -target-cpu pwr10 \
+// RUN:            -target-feature +altivec -target-feature +vsx \
+// RUN:            -target-feature -power10-vector -fsyntax-only -verify %s
+
+#include <altivec.h>
+
+// Test 'vector bool __int128' type.
+
+// These should have errors.
+__vector bool __int128 v1_bi128;          // expected-error {{use of '__int128' with '__vector bool' requires VSX support enabled (on POWER10 or later)}}
+__vector __bool __int128 v2_bi128;        // expected-error {{use of '__int128' with '__vector bool' requires VSX support enabled (on POWER10 or later)}}
+vector bool __int128 v3_bi128;            // expected-error {{use of '__int128' with '__vector bool' requires VSX support enabled (on POWER10 or later)}}
+vector __bool __int128 v4_bi128;          // expected-error {{use of '__int128' with '__vector bool' requires VSX support enabled (on POWER10 or later)}}
+__vector bool unsigned __int128 v5_bi128; // expected-error {{cannot use 'unsigned' with '__vector bool'}} expected-error {{use of '__int128' with '__vector bool' requires VSX support enabled (on POWER10 or later)}}
+__vector bool signed __int128 v6_bi128;   // expected-error {{cannot use 'signed' with '__vector bool'}} expected-error {{use of '__int128' with '__vector bool' requires VSX support enabled (on POWER10 or later)}}
+vector bool unsigned __int128 v7_bi128;   // expected-error {{cannot use 'unsigned' with '__vector bool'}} expected-error {{use of '__int128' with '__vector bool' requires VSX support enabled (on POWER10 or later)}}
+vector bool signed __int128 v8_bi128;     // expected-error {{cannot use 'signed' with '__vector bool'}} expected-error {{use of '__int128' with '__vector bool' requires VSX support enabled (on POWER10 or later)}}
+__vector __bool signed __int128 v9_bi128; // expected-error {{cannot use 'signed' with '__vector bool'}} expected-error {{use of '__int128' with '__vector bool' requires VSX support enabled (on POWER10 or later)}}
+vector __bool signed __int128 v10_bi128;  // expected-error {{cannot use 'signed' with '__vector bool'}} expected-error {{use of '__int128' with '__vector bool' requires VSX support enabled (on POWER10 or later)}}

clang/test/Parser/p10-vector-bool-128.c

+// RUN: %clang_cc1 -triple=powerpc64-unknown-linux-gnu -target-cpu pwr10 \
+// RUN:            -target-feature +altivec -target-feature +vsx \
+// RUN:            -target-feature +power10-vector -fsyntax-only -verify %s
+// RUN: %clang_cc1 -triple=powerpc64le-unknown-linux-gnu -target-cpu pwr10 \
+// RUN:            -target-feature +altivec -target-feature +vsx \
+// RUN:            -target-feature +power10-vector -fsyntax-only -verify %s
+// expected-no-diagnostics
+
+// Test legitimate uses of 'vector bool __int128' with VSX.
+__vector bool __int128 v1_bi128;
+__vector __bool __int128 v2_bi128;
+vector bool __int128 v3_bi128;
+vector __bool __int128 v4_bi128;