Add support for VLA data-sharing OperandBundles

Closes llvm#4

Author: mikaoP

llvm/include/llvm/IR/LLVMContext.h

@@ -114,9 +114,12 @@ class LLVMContext {
     OB_funclet = 1,       // "funclet"
     OB_gc_transition = 2, // "gc-transition"
     // OmpSs IDs
-    OB_oss_shared = 3,       // "oss_shared"
-    OB_oss_private = 4,      // "oss_private"
-    OB_oss_firstprivate = 5, // "oss_firstprivate"
+    OB_oss_shared = 3,           // "oss_shared"
+    OB_oss_shared_vla = 4,       // "oss_shared_vla"
+    OB_oss_private = 5,          // "oss_private"
+    OB_oss_private_vla = 6,      // "oss_private_vla"
+    OB_oss_firstprivate = 7,     // "oss_firstprivate"
+    OB_oss_firstprivate_vla = 8, // "oss_firstprivate_vla"
   };
 
   /// getMDKindID - Return a unique non-zero ID for the specified metadata kind.

llvm/lib/Analysis/OmpSsRegionAnalysis.cpp

@@ -127,6 +127,17 @@ static void getValueFromOperandBundlesWithID(const IntrinsicInst *I,
   }
 }
 
+// Gather Value list from each OperandBundle Id.
+static void getValueListFromOperandBundlesWithID(const IntrinsicInst *I,
+                                              SetVector<Value *> &Values,
+                                              uint32_t Id) {
+  SmallVector<OperandBundleDef, 4> OpBundles;
+  getOperandBundlesAsDefsWithID(I, OpBundles, Id);
+  for (OperandBundleDef &OBDef : OpBundles) {
+    Values.insert(OBDef.input_begin(), OBDef.input_end());
+  }
+}
+
 void OmpSsRegionAnalysisPass::getTaskFunctionUsesInfo(
     Function &F, DominatorTree &DT, TaskFunctionInfo &FuncInfo,
     TaskFunctionAnalysisInfo &FuncAnalysisInfo,
@@ -167,6 +178,13 @@ void OmpSsRegionAnalysisPass::getTaskFunctionUsesInfo(
           getValueFromOperandBundlesWithID(II, T.Info.DSAInfo.Firstprivate,
                                             LLVMContext::OB_oss_firstprivate);
 
+          getValueListFromOperandBundlesWithID(II, T.Info.DSAInfo.Shared,
+                                            LLVMContext::OB_oss_shared_vla);
+          getValueListFromOperandBundlesWithID(II, T.Info.DSAInfo.Private,
+                                            LLVMContext::OB_oss_private_vla);
+          getValueListFromOperandBundlesWithID(II, T.Info.DSAInfo.Firstprivate,
+                                            LLVMContext::OB_oss_firstprivate_vla);
+
           Stack.push_back(T);
         } else if (II->getIntrinsicID() == Intrinsic::directive_region_exit) {
           if (Stack.empty())

llvm/lib/IR/LLVMContext.cpp

@@ -91,15 +91,30 @@ LLVMContext::LLVMContext() : pImpl(new LLVMContextImpl(*this)) {
          "oss_shared operand bundle id drifted!");
   (void)OSSSharedEntry;
 
+  auto *OSSSharedVLAEntry = pImpl->getOrInsertBundleTag("QUAL.OSS.SHARED.VLA");
+  assert(OSSSharedVLAEntry->second == LLVMContext::OB_oss_shared_vla &&
+         "oss_shared_vla operand bundle id drifted!");
+  (void)OSSSharedVLAEntry;
+
   auto *OSSPrivateEntry = pImpl->getOrInsertBundleTag("QUAL.OSS.PRIVATE");
   assert(OSSPrivateEntry->second == LLVMContext::OB_oss_private &&
          "oss_private operand bundle id drifted!");
   (void)OSSPrivateEntry;
 
+  auto *OSSPrivateVLAEntry = pImpl->getOrInsertBundleTag("QUAL.OSS.PRIVATE.VLA");
+  assert(OSSPrivateVLAEntry->second == LLVMContext::OB_oss_private_vla &&
+         "oss_private_vla operand bundle id drifted!");
+  (void)OSSPrivateVLAEntry;
+
   auto *OSSFirstPrivateEntry = pImpl->getOrInsertBundleTag("QUAL.OSS.FIRSTPRIVATE");
   assert(OSSFirstPrivateEntry->second == LLVMContext::OB_oss_firstprivate &&
          "oss_firstprivate operand bundle id drifted!");
   (void)OSSFirstPrivateEntry;
+
+  auto *OSSFirstPrivateVLAEntry = pImpl->getOrInsertBundleTag("QUAL.OSS.FIRSTPRIVATE.VLA");
+  assert(OSSFirstPrivateVLAEntry->second == LLVMContext::OB_oss_firstprivate_vla &&
+         "oss_firstprivate_vla operand bundle id drifted!");
+  (void)OSSFirstPrivateVLAEntry;
   // END OmpSs IDs
 
   SyncScope::ID SingleThreadSSID =