Index: llvm/CMakeLists.txt
===================================================================
--- llvm/CMakeLists.txt
+++ llvm/CMakeLists.txt
@@ -712,6 +712,11 @@
   set(LLVMOPTIONALCOMPONENTS ${LLVMOPTIONALCOMPONENTS} PerfJITEvents)
 endif (LLVM_USE_PERF)
 
+# LLVM_COLLAB
+SET(LLVM_COLLAB ON)
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DLLVM_COLLAB=1")
+# end LLVM_COLLAB
+
 message(STATUS "Constructing LLVMBuild project information")
 execute_process(
   COMMAND ${PYTHON_EXECUTABLE} -B ${LLVMBUILDTOOL}
Index: llvm/include/llvm/IR/CMakeLists.txt
===================================================================
--- llvm/include/llvm/IR/CMakeLists.txt
+++ llvm/include/llvm/IR/CMakeLists.txt
@@ -5,3 +5,8 @@
 tablegen(LLVM IntrinsicEnums.inc -gen-intrinsic-enums)
 tablegen(LLVM IntrinsicImpl.inc -gen-intrinsic-impl)
 add_public_tablegen_target(intrinsics_gen)
+if (LLVM_COLLAB)
+set(LLVM_TARGET_DEFINITIONS Directives.td)
+tablegen(LLVM Directives.gen -gen-directives)
+add_public_tablegen_target(directives_gen)
+endif(LLVM_COLLAB)
Index: llvm/include/llvm/IR/Directives.td
===================================================================
--- /dev/null
+++ llvm/include/llvm/IR/Directives.td
@@ -0,0 +1,252 @@
+// LLVM_COLLAB   -*- tablegen -*-
+//==- Directives.td - Defines all parallelization and -------*- tablegen -*-==//
+//                    vectorization directives and clauses.
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+// ===--------------------------------------------------------------------=== //
+///
+/// \file
+/// This file defines the classes used to represent parallelization and
+/// vectorization directives and clauses. Each different type of directive and
+/// clause is then instantiated accordingly. TableGen parses these records and
+/// generates enums for both classes, as well as tables which provide an
+/// enum->string and string->enum mapping. The enums and tables are used to
+/// generate Metadata strings that are used as arguments to llvm.directive
+/// intrinsics. These intrinsics are used to mark parallel/vector constructs
+/// and behavior.
+///
+// ===--------------------------------------------------------------------=== //
+
+// The Directive class represents all parallel/vector constructs that can be
+// represented within LLVM IR. For example, the "#pragma omp parallel"
+// directive for OpenMP.
+class Directive;
+
+// The Clause class represents additional information provided to Directives
+// that can be used to control parallel/vector execution. For example,
+// "#pragma omp parallel" could be modified to include the "if (expr)" clause
+// to determine if the region should be executed in parallel or not.
+class Clause;
+
+// For additional information on the supported Directives and Clauses, please
+// refer to the following documentation. Currently, this file defines only
+// the directives and clauses associated with OpenMP, but will be extended in
+// the future for other parallel/vector programming models and APIs.
+//
+// http://openmp.org/wp/openmp-specifications
+
+// *** Begin OpenMP Directives ***
+
+def "DIR.OMP.PARALLEL" : Directive;
+def "DIR.OMP.END.PARALLEL" : Directive;
+
+def "DIR.OMP.LOOP" : Directive;
+def "DIR.OMP.END.LOOP" : Directive;
+
+def "DIR.OMP.PARALLEL.LOOP" : Directive;
+def "DIR.OMP.END.PARALLEL.LOOP" : Directive;
+
+def "DIR.OMP.SECTIONS" : Directive;
+def "DIR.OMP.END.SECTIONS" : Directive;
+
+def "DIR.OMP.PARALLEL.SECTIONS" : Directive;
+def "DIR.OMP.END.PARALLEL.SECTIONS" : Directive;
+
+def "DIR.OMP.WORKSHARE" : Directive;
+def "DIR.OMP.END.WORKSHARE" : Directive;
+
+def "DIR.OMP.PARALLEL.WORKSHARE" : Directive;
+def "DIR.OMP.END.PARALLEL.WORKSHARE" : Directive;
+
+def "DIR.OMP.SECTION" : Directive;
+def "DIR.OMP.END.SECTION" : Directive;
+
+def "DIR.OMP.SINGLE" : Directive;
+def "DIR.OMP.END.SINGLE" : Directive;
+
+def "DIR.OMP.TASK" : Directive;
+def "DIR.OMP.END.TASK" : Directive;
+
+def "DIR.OMP.MASTER" : Directive;
+def "DIR.OMP.END.MASTER" : Directive;
+
+def "DIR.OMP.CRITICAL" : Directive;
+def "DIR.OMP.END.CRITICAL" : Directive;
+
+def "DIR.OMP.BARRIER" : Directive;
+def "DIR.OMP.END.BARRIER" : Directive;
+
+def "DIR.OMP.TASKWAIT" : Directive;
+def "DIR.OMP.END.TASKWAIT" : Directive;
+
+def "DIR.OMP.TASKYIELD" : Directive;
+def "DIR.OMP.END.TASKYIELD" : Directive;
+
+def "DIR.OMP.ATOMIC" : Directive;
+def "DIR.OMP.END.ATOMIC" : Directive;
+
+def "DIR.OMP.FLUSH" : Directive;
+def "DIR.OMP.END.FLUSH" : Directive;
+
+def "DIR.OMP.THREADPRIVATE" : Directive;
+
+def "DIR.OMP.ORDERED" : Directive;
+def "DIR.OMP.END.ORDERED" : Directive;
+
+def "DIR.OMP.SIMD" : Directive;
+def "DIR.OMP.END.SIMD" : Directive;
+
+def "DIR.OMP.TASKGROUP" : Directive;
+def "DIR.OMP.END.TASKGROUP" : Directive;
+
+def "DIR.OMP.TASKLOOP" : Directive;
+def "DIR.OMP.END.TASKLOOP" : Directive;
+
+def "DIR.OMP.TARGET" : Directive;
+def "DIR.OMP.END.TARGET" : Directive;
+
+def "DIR.OMP.TARGET.DATA" : Directive;
+def "DIR.OMP.END.TARGET.DATA" : Directive;
+
+def "DIR.OMP.TARGET.UPDATE" : Directive;
+def "DIR.OMP.END.TARGET.UPDATE" : Directive;
+
+def "DIR.OMP.TEAMS" : Directive;
+def "DIR.OMP.END.TEAMS" : Directive;
+
+def "DIR.OMP.DISTRIBUTE" : Directive;
+def "DIR.OMP.END.DISTRIBUTE" : Directive;
+
+def "DIR.OMP.DISTRIBUTE.PARLOOP" : Directive;
+def "DIR.OMP.END.DISTRIBUTE.PARLOOP" : Directive;
+
+def "DIR.OMP.TARGET.ENTER.DATA" : Directive;
+def "DIR.OMP.END.TARGET.ENTER.DATA" : Directive;
+
+def "DIR.OMP.TARGET.EXIT.DATA" : Directive;
+def "DIR.OMP.END.TARGET.EXIT.DATA" : Directive;
+
+def "DIR.OMP.CANCEL" : Directive;
+def "DIR.OMP.END.CANCEL" : Directive;
+
+def "DIR.OMP.CANCELLATION.POINT" : Directive;
+def "DIR.OMP.END.CANCELLATION.POINT" : Directive;
+
+
+// *** Begin OpenMP Clauses ***
+
+def "QUAL.OMP.DEFAULT.NONE" : Clause;
+def "QUAL.OMP.DEFAULT.SHARED" : Clause;
+def "QUAL.OMP.DEFAULT.PRIVATE" : Clause;
+def "QUAL.OMP.DEFAULT.FIRSTPRIVATE" : Clause;
+def "QUAL.OMP.MERGEABLE" : Clause;
+def "QUAL.OMP.NOWAIT" : Clause;
+def "QUAL.OMP.NOGROUP" : Clause;
+def "QUAL.OMP.UNTIED" : Clause;
+def "QUAL.OMP.READ" : Clause;
+def "QUAL.OMP.READ.SEQ_CST" : Clause;
+def "QUAL.OMP.WRITE" : Clause;
+def "QUAL.OMP.WRITE.SEQ_CST" : Clause;
+def "QUAL.OMP.UPDATE" : Clause;
+def "QUAL.OMP.UPDATE.SEQ_CST" : Clause;
+def "QUAL.OMP.CAPTURE" : Clause;
+def "QUAL.OMP.CAPTURE.SEQ_CST" : Clause;
+def "QUAL.OMP.PROC.BIND.MASTER" : Clause;
+def "QUAL.OMP.PROC.BIND.CLOSE" : Clause;
+def "QUAL.OMP.PROC.BIND.SPREAD" : Clause;
+def "QUAL.OMP.IF" : Clause;
+def "QUAL.OMP.COLLAPSE" : Clause;
+def "QUAL.OMP.NUM_THREADS" : Clause;
+def "QUAL.OMP.ORDERED" : Clause;
+def "QUAL.OMP.SAFELEN" : Clause;
+def "QUAL.OMP.SIMDLEN" : Clause;
+def "QUAL.OMP.FINAL" : Clause;
+def "QUAL.OMP.GRAINSIZE" : Clause;
+def "QUAL.OMP.NUM_TASKS" : Clause;
+def "QUAL.OMP.PRIORITY" : Clause;
+def "QUAL.OMP.NUM_TEAMS" : Clause;
+def "QUAL.OMP.THREAD_LIMIT" : Clause;
+def "QUAL.OMP.DIST_SCHEDULE.STATIC" : Clause;
+def "QUAL.OMP.SCHEDULE.STATIC" : Clause;
+def "QUAL.OMP.SCHEDULE.DYNAMIC" : Clause;
+def "QUAL.OMP.SCHEDULE.GUIDED" : Clause;
+def "QUAL.OMP.SCHEDULE.AUTO" : Clause;
+def "QUAL.OMP.SCHEDULE.RUNTIME" : Clause;
+def "QUAL.OMP.SHARED" : Clause;
+def "QUAL.OMP.PRIVATE" : Clause;
+def "QUAL.OMP.FIRSTPRIVATE" : Clause;
+def "QUAL.OMP.LASTPRIVATE" : Clause;
+def "QUAL.OMP.COPYIN" : Clause;
+def "QUAL.OMP.COPYPRIVATE" : Clause;
+def "QUAL.OMP.REDUCTION.ADD" : Clause;
+def "QUAL.OMP.REDUCTION.SUB" : Clause;
+def "QUAL.OMP.REDUCTION.MUL" : Clause;
+def "QUAL.OMP.REDUCTION.AND" : Clause;
+def "QUAL.OMP.REDUCTION.OR" : Clause;
+def "QUAL.OMP.REDUCTION.BXOR" : Clause;
+def "QUAL.OMP.REDUCTION.BAND" : Clause;
+def "QUAL.OMP.REDUCTION.BOR" : Clause;
+def "QUAL.OMP.REDUCTION.MAX" : Clause;
+def "QUAL.OMP.REDUCTION.MIN" : Clause;
+def "QUAL.OMP.REDUCTION.UDR" : Clause;
+def "QUAL.OMP.INREDUCTION.ADD" : Clause;
+def "QUAL.OMP.INREDUCTION.SUB" : Clause;
+def "QUAL.OMP.INREDUCTION.MUL" : Clause;
+def "QUAL.OMP.INREDUCTION.AND" : Clause;
+def "QUAL.OMP.INREDUCTION.OR" : Clause;
+def "QUAL.OMP.INREDUCTION.BXOR" : Clause;
+def "QUAL.OMP.INREDUCTION.BAND" : Clause;
+def "QUAL.OMP.INREDUCTION.BOR" : Clause;
+def "QUAL.OMP.INREDUCTION.MAX" : Clause;
+def "QUAL.OMP.INREDUCTION.MIN" : Clause;
+def "QUAL.OMP.INREDUCTION.UDR" : Clause;
+def "QUAL.OMP.TO" : Clause;
+def "QUAL.OMP.FROM" : Clause;
+def "QUAL.OMP.LINEAR" : Clause;
+def "QUAL.OMP.UNIFORM" : Clause;
+def "QUAL.OMP.ALIGNED" : Clause;
+def "QUAL.OMP.FLUSH" : Clause;
+def "QUAL.OMP.THREADPRIVATE" : Clause;
+def "QUAL.OMP.DEVICE" : Clause;
+def "QUAL.OMP.IS_DEVICE_PTR" : Clause;
+def "QUAL.OMP.USE_DEVICE_PTR" : Clause;
+def "QUAL.OMP.DEFAULTMAP.TOFROM.SCALAR" : Clause;
+def "QUAL.OMP.MAP.TO" : Clause;
+def "QUAL.OMP.MAP.FROM" : Clause;
+def "QUAL.OMP.MAP.TOFROM" : Clause;
+def "QUAL.OMP.MAP.ALLOC" : Clause;
+def "QUAL.OMP.MAP.RELEASE" : Clause;
+def "QUAL.OMP.MAP.DELETE" : Clause;
+def "QUAL.OMP.MAP.ALWAYS.TO" : Clause;
+def "QUAL.OMP.MAP.ALWAYS.FROM" : Clause;
+def "QUAL.OMP.MAP.ALWAYS.TOFROM" : Clause;
+def "QUAL.OMP.MAP.ALWAYS.ALLOC" : Clause;
+def "QUAL.OMP.MAP.ALWAYS.RELEASE" : Clause;
+def "QUAL.OMP.MAP.ALWAYS.DELETE" : Clause;
+def "QUAL.OMP.DEPEND.IN" : Clause;
+def "QUAL.OMP.DEPEND.OUT" : Clause;
+def "QUAL.OMP.DEPEND.INOUT" : Clause;
+def "QUAL.OMP.DEPEND.SOURCE" : Clause;
+def "QUAL.OMP.DEPEND.SINK" : Clause;
+def "QUAL.OMP.ORDERED.THREADS" : Clause;
+def "QUAL.OMP.ORDERED.SIMD" : Clause;
+def "QUAL.OMP.CANCEL.PARALLEL" : Clause;
+def "QUAL.OMP.CANCEL.LOOP" : Clause;
+def "QUAL.OMP.CANCEL.SECTIONS" : Clause;
+def "QUAL.OMP.CANCEL.TASKGROUP" : Clause;
+def "QUAL.OMP.HINT" : Clause;
+def "QUAL.OMP.NAME" : Clause;
+
+// *** Begin Auxiliary Clauses ***
+// These "clauses" don't correspond to actual OpenMP clauses, but are used
+// to carry additional information
+
+def "QUAL.OMP.NORMALIZED.IV" : Clause;
+def "QUAL.OMP.NORMALIZED.UB" : Clause;
+def "QUAL.OMP.CANCELLATION.POINTS" : Clause;
+def "QUAL.OMP.OFFLOAD.ENTRY.IDX" : Clause;
+
+// end LLVM_COLLAB
Index: llvm/include/llvm/IR/GlobalValue.h
===================================================================
--- llvm/include/llvm/IR/GlobalValue.h
+++ llvm/include/llvm/IR/GlobalValue.h
@@ -79,6 +79,9 @@
         ValueType(Ty), Visibility(DefaultVisibility),
         UnnamedAddrVal(unsigned(UnnamedAddr::None)),
         DllStorageClass(DefaultStorageClass), ThreadLocal(NotThreadLocal),
+#if LLVM_COLLAB
+        ThreadPrivate(0), TargetDeclare(0),
+#endif // LLVM_COLLAB
         HasLLVMReservedName(false), IsDSOLocal(false), IntID((Intrinsic::ID)0U),
         Parent(nullptr) {
     setLinkage(Linkage);
@@ -87,7 +90,14 @@
 
   Type *ValueType;
 
+#if LLVM_COLLAB
+  // INTEL - This needs to be two less than it is in the community version to
+  // account for the ThreadPrivate bit and TargetDeclare bit.  See also
+  // the comment at the SubClassData declaration.
+  static const unsigned GlobalValueSubClassDataBits = 15;
+#else
   static const unsigned GlobalValueSubClassDataBits = 17;
+#endif // LLVM_COLLAB
 
   // All bitfields use unsigned as the underlying type so that MSVC will pack
   // them.
@@ -98,6 +108,15 @@
 
   unsigned ThreadLocal : 3; // Is this symbol "Thread Local", if so, what is
                             // the desired model?
+#if LLVM_COLLAB
+  unsigned ThreadPrivate : 1; // The thread_private attribute indicates
+                              // if the global variable is associated
+                              // with an OpenMP threadprivate directive
+                              // and the threadprivate mode is legacy.
+  unsigned TargetDeclare : 1; // The target declare attribute indicates
+                              // if the global variable is associated
+                              // with an OpenMP declare target directive.
+#endif // LLVM_COLLAB
 
   /// True if the function's name starts with "llvm.".  This corresponds to the
   /// value of Function::isIntrinsic(), which may be true even if
@@ -242,6 +261,13 @@
     maybeSetDsoLocal();
   }
 
+#if LLVM_COLLAB
+  bool isThreadPrivate() const { return ThreadPrivate; }
+  void setThreadPrivate(bool Val) { ThreadPrivate = Val; }
+
+  bool isTargetDeclare() const { return TargetDeclare; }
+  void setTargetDeclare(bool Val) { TargetDeclare = Val; }
+#endif // LLVM_COLLAB
   /// If the value is "Thread Local", its value isn't shared by the threads.
   bool isThreadLocal() const { return getThreadLocalMode() != NotThreadLocal; }
   void setThreadLocal(bool Val) {
Index: llvm/include/llvm/IR/Intrinsics.td
===================================================================
--- llvm/include/llvm/IR/Intrinsics.td
+++ llvm/include/llvm/IR/Intrinsics.td
@@ -933,6 +933,13 @@
                                 [llvm_token_ty, llvm_i32_ty, llvm_i32_ty],
                                 [IntrReadMem, ImmArg<1>, ImmArg<2>]>;
 
+// LLVM_COLLAB
+//===------------------------ Directive Intrinsics ------------------------===//
+//
+def int_directive_region_entry : Intrinsic<[llvm_token_ty], [], []>;
+def int_directive_region_exit  : Intrinsic<[], [llvm_token_ty], []>;
+def int_directive_marker       : Intrinsic<[], [], []>;
+// end LLVM_COLLAB
 //===------------------------ Coroutine Intrinsics ---------------===//
 // These are documented in docs/Coroutines.rst
 
Index: llvm/include/llvm/IR/Module.h
===================================================================
--- llvm/include/llvm/IR/Module.h
+++ llvm/include/llvm/IR/Module.h
@@ -189,6 +189,9 @@
   void *NamedMDSymTab;            ///< NamedMDNode names.
   DataLayout DL;                  ///< DataLayout associated with the module
 
+#if LLVM_COLLAB
+  std::string TargetDevices;      ///< Target devices
+#endif // LLVM_COLLAB
   friend class Constant;
 
 /// @}
@@ -239,6 +242,11 @@
   /// @returns a string containing the target triple.
   const std::string &getTargetTriple() const { return TargetTriple; }
 
+#if LLVM_COLLAB
+  /// Get the target device information which is a comma-separated string
+  /// describing one or more devices.
+  const std::string &getTargetDevices() const { return TargetDevices; }
+#endif // LLVM_COLLAB
   /// Get the global data context.
   /// @returns LLVMContext - a container for LLVM's global information
   LLVMContext &getContext() const { return Context; }
@@ -282,6 +290,10 @@
   /// Set the target triple.
   void setTargetTriple(StringRef T) { TargetTriple = T; }
 
+#if LLVM_COLLAB
+  /// set the target device information.
+  void setTargetDevices(StringRef T) { TargetDevices = T; }
+#endif // LLVM_COLLAB
   /// Set the module-scope inline assembly blocks.
   /// A trailing newline is added if the input doesn't have one.
   void setModuleInlineAsm(StringRef Asm) {