merge main into amd-staging

Author: ranapratap55

clang/bindings/python/clang/cindex.py

@@ -1410,9 +1410,6 @@ def is_unexposed(self):
     # OpenMP scope directive.
     OMP_SCOPE_DIRECTIVE = 306
 
-    # OpenMP stripe directive.
-    OMP_STRIPE_DIRECTIVE = 310
-
     # OpenACC Compute Construct.
     OPEN_ACC_COMPUTE_DIRECTIVE = 320
 

clang/cmake/modules/AddClang.cmake

@@ -138,6 +138,10 @@ macro(add_clang_library name)
           ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}
           RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
 
+        if (LLVM_ENABLE_PDB)
+          install(FILES $<TARGET_PDB_FILE:${name}> DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT ${name} OPTIONAL)
+        endif()
+
         if (NOT LLVM_ENABLE_IDE)
           add_llvm_install_targets(install-${lib}
                                    DEPENDS ${lib}

clang/docs/OpenMPSupport.rst

@@ -374,8 +374,6 @@ implementation.
 +-------------------------------------------------------------+---------------------------+---------------------------+--------------------------------------------------------------------------+
 | Loop transformation constructs                              | :none:`unclaimed`         | :none:`unclaimed`         |                                                                          |
 +-------------------------------------------------------------+---------------------------+---------------------------+--------------------------------------------------------------------------+
-| loop stripe transformation                                  | :good:`done`              | https://github.com/llvm/llvm-project/pull/119891                                                     |
-+-------------------------------------------------------------+---------------------------+---------------------------+--------------------------------------------------------------------------+
 | work distribute construct                                   | :none:`unclaimed`         | :none:`unclaimed`         |                                                                          |
 +-------------------------------------------------------------+---------------------------+---------------------------+--------------------------------------------------------------------------+
 | task_iteration                                              | :none:`unclaimed`         | :none:`unclaimed`         |                                                                          |

clang/docs/ReleaseNotes.rst

@@ -291,7 +291,6 @@ Python Binding Changes
 OpenMP Support
 --------------
 - Added support 'no_openmp_constructs' assumption clause.
-- Added support for 'omp stripe' directive.
 
 Improvements
 ^^^^^^^^^^^^

clang/include/clang-c/Index.h

@@ -2158,10 +2158,6 @@ enum CXCursorKind {
    */
   CXCursor_OMPAssumeDirective = 309,
 
-  /** OpenMP assume directive.
-   */
-  CXCursor_OMPStripeDirective = 310,
-
   /** OpenACC Compute Construct.
    */
   CXCursor_OpenACCComputeConstruct = 320,

clang/include/clang/AST/RecursiveASTVisitor.h

@@ -3056,9 +3056,6 @@ DEF_TRAVERSE_STMT(OMPSimdDirective,
 DEF_TRAVERSE_STMT(OMPTileDirective,
                   { TRY_TO(TraverseOMPExecutableDirective(S)); })
 
-DEF_TRAVERSE_STMT(OMPStripeDirective,
-                  { TRY_TO(TraverseOMPExecutableDirective(S)); })
-
 DEF_TRAVERSE_STMT(OMPUnrollDirective,
                   { TRY_TO(TraverseOMPExecutableDirective(S)); })
 

clang/include/clang/AST/StmtOpenMP.h

@@ -994,9 +994,7 @@ class OMPLoopTransformationDirective : public OMPLoopBasedDirective {
   static bool classof(const Stmt *T) {
     Stmt::StmtClass C = T->getStmtClass();
     return C == OMPTileDirectiveClass || C == OMPUnrollDirectiveClass ||
-           C == OMPReverseDirectiveClass || C == OMPInterchangeDirectiveClass ||
-           C == OMPStripeDirectiveClass;
-    ;
+           C == OMPReverseDirectiveClass || C == OMPInterchangeDirectiveClass;
   }
 };
 
@@ -5562,7 +5560,7 @@ class OMPTileDirective final : public OMPLoopTransformationDirective {
       : OMPLoopTransformationDirective(OMPTileDirectiveClass,
                                        llvm::omp::OMPD_tile, StartLoc, EndLoc,
                                        NumLoops) {
-    setNumGeneratedLoops(2 * NumLoops);
+    setNumGeneratedLoops(3 * NumLoops);
   }
 
   void setPreInits(Stmt *PreInits) {
@@ -5623,82 +5621,6 @@ class OMPTileDirective final : public OMPLoopTransformationDirective {
   }
 };
 
-/// This represents the '#pragma omp stripe' loop transformation directive.
-class OMPStripeDirective final : public OMPLoopTransformationDirective {
-  friend class ASTStmtReader;
-  friend class OMPExecutableDirective;
-
-  /// Default list of offsets.
-  enum {
-    PreInitsOffset = 0,
-    TransformedStmtOffset,
-  };
-
-  explicit OMPStripeDirective(SourceLocation StartLoc, SourceLocation EndLoc,
-                              unsigned NumLoops)
-      : OMPLoopTransformationDirective(OMPStripeDirectiveClass,
-                                       llvm::omp::OMPD_stripe, StartLoc, EndLoc,
-                                       NumLoops) {
-    setNumGeneratedLoops(2 * NumLoops);
-  }
-
-  void setPreInits(Stmt *PreInits) {
-    Data->getChildren()[PreInitsOffset] = PreInits;
-  }
-
-  void setTransformedStmt(Stmt *S) {
-    Data->getChildren()[TransformedStmtOffset] = S;
-  }
-
-public:
-  /// Create a new AST node representation for '#pragma omp stripe'.
-  ///
-  /// \param C         Context of the AST.
-  /// \param StartLoc  Location of the introducer (e.g. the 'omp' token).
-  /// \param EndLoc    Location of the directive's end (e.g. the tok::eod).
-  /// \param Clauses   The directive's clauses.
-  /// \param NumLoops  Number of associated loops (number of items in the
-  ///                  'sizes' clause).
-  /// \param AssociatedStmt The outermost associated loop.
-  /// \param TransformedStmt The loop nest after striping, or nullptr in
-  ///                        dependent contexts.
-  /// \param PreInits Helper preinits statements for the loop nest.
-  static OMPStripeDirective *
-  Create(const ASTContext &C, SourceLocation StartLoc, SourceLocation EndLoc,
-         ArrayRef<OMPClause *> Clauses, unsigned NumLoops, Stmt *AssociatedStmt,
-         Stmt *TransformedStmt, Stmt *PreInits);
-
-  /// Build an empty '#pragma omp stripe' AST node for deserialization.
-  ///
-  /// \param C          Context of the AST.
-  /// \param NumClauses Number of clauses to allocate.
-  /// \param NumLoops   Number of associated loops to allocate.
-  static OMPStripeDirective *
-  CreateEmpty(const ASTContext &C, unsigned NumClauses, unsigned NumLoops);
-
-  /// Gets/sets the associated loops after striping.
-  ///
-  /// This is in de-sugared format stored as a CompoundStmt.
-  ///
-  /// \code
-  ///   for (...)
-  ///     ...
-  /// \endcode
-  ///
-  /// Note that if the generated loops a become associated loops of another
-  /// directive, they may need to be hoisted before them.
-  Stmt *getTransformedStmt() const {
-    return Data->getChildren()[TransformedStmtOffset];
-  }
-
-  /// Return preinits statement.
-  Stmt *getPreInits() const { return Data->getChildren()[PreInitsOffset]; }
-
-  static bool classof(const Stmt *T) {
-    return T->getStmtClass() == OMPStripeDirectiveClass;
-  }
-};
-
 /// This represents the '#pragma omp unroll' loop transformation directive.
 ///
 /// \code

clang/include/clang/Basic/FPOptions.def

@@ -28,5 +28,5 @@ OPTION(FPEvalMethod, LangOptions::FPEvalMethodKind, 2, AllowApproxFunc)
 OPTION(Float16ExcessPrecision, LangOptions::ExcessPrecisionKind, 2, FPEvalMethod)
 OPTION(BFloat16ExcessPrecision, LangOptions::ExcessPrecisionKind, 2, Float16ExcessPrecision)
 OPTION(MathErrno, bool, 1, BFloat16ExcessPrecision)
-OPTION(ComplexRange, LangOptions::ComplexRangeKind, 2, MathErrno)
+OPTION(ComplexRange, LangOptions::ComplexRangeKind, 3, MathErrno)
 #undef OPTION

clang/include/clang/Basic/LangOptions.def

@@ -238,7 +238,7 @@ BENIGN_LANGOPT(NoSignedZero      , 1, 0, "Permit Floating Point optimization wit
 BENIGN_LANGOPT(AllowRecip        , 1, 0, "Permit Floating Point reciprocal")
 BENIGN_LANGOPT(ApproxFunc        , 1, 0, "Permit Floating Point approximation")
 
-ENUM_LANGOPT(ComplexRange, ComplexRangeKind, 2, CX_None, "Enable use of range reduction for complex arithmetics.")
+ENUM_LANGOPT(ComplexRange, ComplexRangeKind, 3, CX_None, "Enable use of range reduction for complex arithmetics.")
 
 BENIGN_LANGOPT(ObjCGCBitmapPrint , 1, 0, "printing of GC's bitmap layout for __weak/__strong ivars")
 

clang/include/clang/Basic/LangOptions.h

@@ -648,9 +648,12 @@ class LangOptions : public LangOptionsBase {
 
   // Define accessors/mutators for language options of enumeration type.
 #define LANGOPT(Name, Bits, Default, Description)
-#define ENUM_LANGOPT(Name, Type, Bits, Default, Description) \
-  Type get##Name() const { return static_cast<Type>(Name); } \
-  void set##Name(Type Value) { Name = static_cast<unsigned>(Value); }
+#define ENUM_LANGOPT(Name, Type, Bits, Default, Description)                   \
+  Type get##Name() const { return static_cast<Type>(Name); }                   \
+  void set##Name(Type Value) {                                                 \
+    assert(static_cast<unsigned>(Value) < (1u << Bits));                       \
+    Name = static_cast<unsigned>(Value);                                       \
+  }
 #include "clang/Basic/LangOptions.def"
 
   /// Are we compiling a module?
@@ -959,11 +962,14 @@ class FPOptions {
   void applyChanges(FPOptionsOverride FPO);
 
   // We can define most of the accessors automatically:
+  // TODO: consider enforcing the assertion that value fits within bits
+  // statically.
 #define OPTION(NAME, TYPE, WIDTH, PREVIOUS)                                    \
   TYPE get##NAME() const {                                                     \
     return static_cast<TYPE>((Value & NAME##Mask) >> NAME##Shift);             \
   }                                                                            \
   void set##NAME(TYPE value) {                                                 \
+    assert(storage_type(value) < (1u << WIDTH));                               \
     Value = (Value & ~NAME##Mask) | (storage_type(value) << NAME##Shift);      \
   }
 #include "clang/Basic/FPOptions.def"