[SYCL] Revert all improvements, just fix a bug

Author: AlexeySachkov

clang/include/clang/Basic/Attr.td

@@ -174,10 +174,6 @@ class IdentifierArgument<string name, bit opt = 0> : Argument<name, opt>;
 class IntArgument<string name, bit opt = 0> : Argument<name, opt>;
 class StringArgument<string name, bit opt = 0> : Argument<name, opt>;
 class ExprArgument<string name, bit opt = 0> : Argument<name, opt>;
-class IntegerExprArgument<string name, int undef = 0, bit opt = 0>
-    : ExprArgument<name, opt> {
-  int UndefValue = undef;
-}
 class DeclArgument<DeclNode kind, string name, bit opt = 0, bit fake = 0>
     : Argument<name, opt, fake> {
   DeclNode Kind = kind;
@@ -1293,7 +1289,7 @@ def LoopUnrollHint : InheritableAttr {
 
 def IntelReqdSubGroupSize: InheritableAttr {
   let Spellings = [GNU<"intel_reqd_sub_group_size">, CXX11<"cl", "intel_reqd_sub_group_size">];
-  let Args = [IntegerExprArgument<"SubGroupSize", /* UndefValue = */ 0>];
+  let Args = [ExprArgument<"SubGroupSize">];
   let Subjects = SubjectList<[Function, CXXMethod], ErrorDiag>;
   let Documentation = [IntelReqdSubGroupSizeDocs];
   let LangOpts = [OpenCL, SYCLIsDevice, SYCLIsHost];

clang/lib/CodeGen/CodeGenFunction.cpp

@@ -565,10 +565,16 @@ void CodeGenFunction::EmitOpenCLKernelMetadata(const FunctionDecl *FD,
     Fn->setMetadata("reqd_work_group_size", llvm::MDNode::get(Context, AttrMDArgs));
   }
 
-  if (IntelReqdSubGroupSizeAttr *A = FD->getAttr<IntelReqdSubGroupSizeAttr>()) {
+  if (const IntelReqdSubGroupSizeAttr *A =
+          FD->getAttr<IntelReqdSubGroupSizeAttr>()) {
+    llvm::APSInt ArgVal(32);
     llvm::LLVMContext &Context = getLLVMContext();
-    llvm::Metadata *AttrMDArgs[] = {llvm::ConstantAsMetadata::get(
-        Builder.getInt32(A->getSubGroupSizeEvaluated(FD->getASTContext())))};
+    bool IsValid = A->getSubGroupSize()->isIntegerConstantExpr(
+        ArgVal, FD->getASTContext());
+    assert(IsValid && "Not an integer constant expression");
+    (void)IsValid;
+    llvm::Metadata *AttrMDArgs[] = {
+        llvm::ConstantAsMetadata::get(Builder.getInt32(ArgVal.getSExtValue()))};
     Fn->setMetadata("intel_reqd_sub_group_size",
                     llvm::MDNode::get(Context, AttrMDArgs));
   }

clang/lib/Sema/SemaSYCL.cpp

@@ -308,6 +308,15 @@ static void reportConflictingAttrs(Sema &S, FunctionDecl *F, const Attr *A1,
   F->setInvalidDecl();
 }
 
+/// Returns the signed constant integer value represetned by given expression
+static int getIntExprValue(const Expr *E, ASTContext &Ctx) {
+  llvm::APSInt Val(32);
+  bool IsValid = E->isIntegerConstantExpr(Val, Ctx);
+  assert(IsValid && "expression must be constant integer");
+  (void)IsValid;
+  return Val.getSExtValue();
+}
+
 class MarkDeviceFunction : public RecursiveASTVisitor<MarkDeviceFunction> {
 public:
   MarkDeviceFunction(Sema &S)
@@ -1688,16 +1697,16 @@ void Sema::MarkDevice(void) {
               KernelBody ? KernelBody->getAttr<SYCLSimdAttr>() : nullptr;
           if (auto *Existing =
                   SYCLKernel->getAttr<IntelReqdSubGroupSizeAttr>()) {
-            if (Existing->getSubGroupSizeEvaluated(getASTContext()) !=
-                Attr->getSubGroupSizeEvaluated(getASTContext())) {
+            if (getIntExprValue(Existing->getSubGroupSize(), getASTContext()) !=
+                getIntExprValue(Attr->getSubGroupSize(), getASTContext())) {
               Diag(SYCLKernel->getLocation(),
                    diag::err_conflicting_sycl_kernel_attributes);
               Diag(Existing->getLocation(), diag::note_conflicting_attribute);
               Diag(Attr->getLocation(), diag::note_conflicting_attribute);
               SYCLKernel->setInvalidDecl();
             }
-          } else if (KBSimdAttr &&
-                     (Attr->getSubGroupSizeEvaluated(getASTContext()) != 1)) {
+          } else if (KBSimdAttr && (getIntExprValue(Attr->getSubGroupSize(),
+                                                    getASTContext()) != 1)) {
             reportConflictingAttrs(*this, KernelBody, KBSimdAttr, Attr);
           } else {
             SYCLKernel->addAttr(A);

clang/utils/TableGen/ClangAttrEmitter.cpp

@@ -1161,36 +1161,6 @@ namespace {
     void writeHasChildren(raw_ostream &OS) const override { OS << "true"; }
   };
 
-  class IntegerExprArgument : public ExprArgument {
-  private:
-    int UndefValue;
-
-  public:
-    IntegerExprArgument(const Record &Arg, StringRef Attr)
-        : ExprArgument(Arg, Attr), UndefValue(Arg.getValueAsInt("UndefValue")) {
-    }
-
-    void writeAccessors(raw_ostream &OS) const override {
-      OS << "  " << getType() << " get" << getUpperName() << "() const {\n";
-      OS << "    return " << getLowerName() << ";\n";
-      OS << "  }\n";
-      OS << "private:\n";
-      OS << "  int " << getLowerName() << "Value = " << UndefValue << ";\n";
-      OS << "public:\n";
-      OS << "  int get" << getUpperName() << "Evaluated(ASTContext &Ctx) {\n";
-      OS << "    if (" << getLowerName() << "Value != " << UndefValue << ")\n";
-      OS << "      return " << getLowerName() << "Value;\n";
-      OS << "    llvm::APSInt Val(32);\n";
-      OS << "    bool Succeedded = " << getLowerName()
-         << "->isIntegerConstantExpr(Val, Ctx);\n";
-      OS << "    assert(Succeedded && \"expression must be constant "
-            "integer\");\n";
-      OS << "    " << getLowerName() << "Value = Val.getSExtValue();\n";
-      OS << "    return " << getLowerName() << "Value;\n";
-      OS << "  }";
-    }
-  };
-
   class VariadicExprArgument : public VariadicArgument {
   public:
     VariadicExprArgument(const Record &Arg, StringRef Attr)
@@ -1329,8 +1299,6 @@ createArgument(const Record &Arg, StringRef Attr,
     Ptr = std::make_unique<EnumArgument>(Arg, Attr);
   else if (ArgName == "ExprArgument")
     Ptr = std::make_unique<ExprArgument>(Arg, Attr);
-  else if (ArgName == "IntegerExprArgument")
-    Ptr = std::make_unique<IntegerExprArgument>(Arg, Attr);
   else if (ArgName == "DeclArgument")
     Ptr = std::make_unique<SimpleArgument>(
         Arg, Attr, (Arg.getValueAsDef("Kind")->getName() + "Decl *").str());