From fc935fc35bc2f76c4d1ec984a17e9db508a172de Mon Sep 17 00:00:00 2001 From: Fangrui Song Date: Mon, 8 Jun 2020 09:32:30 -0700 Subject: [PATCH] Reland D80979 [clang] Implement VectorType logic not operator With a fix to use -triple %itanium_abi_triple Differential Revision: https://reviews.llvm.org/D80979 --- clang/docs/LanguageExtensions.rst | 3 +-- clang/lib/CodeGen/CGExprScalar.cpp | 4 +++- clang/lib/Sema/SemaExpr.cpp | 11 +++++++++-- clang/test/CodeGen/vector.cpp | 21 +++++++++++++++++++++ clang/test/Sema/vector-gcc-compat.cpp | 2 +- 5 files changed, 35 insertions(+), 6 deletions(-) create mode 100644 clang/test/CodeGen/vector.cpp diff --git a/clang/docs/LanguageExtensions.rst b/clang/docs/LanguageExtensions.rst index ba0a7d9cf95c..06ecc186c7dc 100644 --- a/clang/docs/LanguageExtensions.rst +++ b/clang/docs/LanguageExtensions.rst @@ -475,7 +475,7 @@ unary operators +, -- yes yes yes -- +,--,*,/,% yes yes yes -- bitwise operators &,|,^,~ yes yes yes -- >>,<< yes yes yes -- -!, &&, || yes -- yes [#]_ -- +!, &&, || yes -- yes -- ==, !=, >, <, >=, <= yes yes yes -- = yes yes yes yes ?: [#]_ yes -- yes -- @@ -488,7 +488,6 @@ const_cast no no no no See also :ref:`langext-__builtin_shufflevector`, :ref:`langext-__builtin_convertvector`. -.. [#] unary operator ! is not implemented, however && and || are. .. [#] ternary operator(?:) has different behaviors depending on condition operand's vector type. If the condition is a GNU vector (i.e. __vector_size__), it's only available in C++ and uses normal bool conversions (that is, != 0). diff --git a/clang/lib/CodeGen/CGExprScalar.cpp b/clang/lib/CodeGen/CGExprScalar.cpp index 4e61349cf4d5..b2bc38b329ef 100644 --- a/clang/lib/CodeGen/CGExprScalar.cpp +++ b/clang/lib/CodeGen/CGExprScalar.cpp @@ -2762,7 +2762,9 @@ Value *ScalarExprEmitter::VisitUnaryNot(const UnaryOperator *E) { Value *ScalarExprEmitter::VisitUnaryLNot(const UnaryOperator *E) { // Perform vector logical not on comparison with zero vector. - if (E->getType()->isExtVectorType()) { + if (E->getType()->isVectorType() && + E->getType()->castAs()->getVectorKind() == + VectorType::GenericVector) { Value *Oper = Visit(E->getSubExpr()); Value *Zero = llvm::Constant::getNullValue(Oper->getType()); Value *Result; diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp index 45c1acecbe94..4bec413f3042 100644 --- a/clang/lib/Sema/SemaExpr.cpp +++ b/clang/lib/Sema/SemaExpr.cpp @@ -14481,12 +14481,19 @@ ExprResult Sema::CreateBuiltinUnaryOp(SourceLocation OpLoc, return ExprError(Diag(OpLoc, diag::err_typecheck_unary_expr) << resultType << Input.get()->getSourceRange()); } + // Vector logical not returns the signed variant of the operand type. + resultType = GetSignedVectorType(resultType); + break; + } else if (Context.getLangOpts().CPlusPlus && resultType->isVectorType()) { + const VectorType *VTy = resultType->castAs(); + if (VTy->getVectorKind() != VectorType::GenericVector) + return ExprError(Diag(OpLoc, diag::err_typecheck_unary_expr) + << resultType << Input.get()->getSourceRange()); + // Vector logical not returns the signed variant of the operand type. resultType = GetSignedVectorType(resultType); break; } else { - // FIXME: GCC's vector extension permits the usage of '!' with a vector - // type in C++. We should allow that here too. return ExprError(Diag(OpLoc, diag::err_typecheck_unary_expr) << resultType << Input.get()->getSourceRange()); } diff --git a/clang/test/CodeGen/vector.cpp b/clang/test/CodeGen/vector.cpp new file mode 100644 index 000000000000..0abb34c809d2 --- /dev/null +++ b/clang/test/CodeGen/vector.cpp @@ -0,0 +1,21 @@ +// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-llvm %s -o - | FileCheck %s + +typedef __attribute__((__vector_size__(16))) float float4; +typedef __attribute__((__vector_size__(16))) int int4; +typedef __attribute__((__vector_size__(16))) unsigned int uint4; + +// CHECK: @_Z5test1Dv4_j +int4 test1(uint4 V0) { + // CHECK: [[CMP0:%.*]] = icmp eq <4 x i32> [[V0:%.*]], zeroinitializer + // CHECK-NEXT: [[V1:%.*]] = sext <4 x i1> [[CMP0]] to <4 x i32> + int4 V = !V0; + return V; +} + +// CHECK: @_Z5test2Dv4_fS_ +int4 test2(float4 V0, float4 V1) { + // CHECK: [[CMP0:%.*]] = fcmp oeq <4 x float> [[V0:%.*]], zeroinitializer + // CHECK-NEXT: [[V1:%.*]] = sext <4 x i1> [[CMP0]] to <4 x i32> + int4 V = !V0; + return V; +} diff --git a/clang/test/Sema/vector-gcc-compat.cpp b/clang/test/Sema/vector-gcc-compat.cpp index 41d50c168c94..cb6547696814 100644 --- a/clang/test/Sema/vector-gcc-compat.cpp +++ b/clang/test/Sema/vector-gcc-compat.cpp @@ -83,7 +83,7 @@ void logicTest(void) { v2i64 v2i64_c = (v2i64){3, 1}; // expected-warning {{compound literals are a C99-specific feature}} v2i64 v2i64_r; - v2i64_r = !v2i64_a; // expected-error {{invalid argument type 'v2i64' (vector of 2 'long long' values) to unary expression}} + v2i64_r = !v2i64_a; v2i64_r = ~v2i64_a; v2i64_r = v2i64_a ? v2i64_b : v2i64_c;