@@ -1756,8 +1756,8 @@ class TaskContextStructManager {
1756
1756
// / De-allocate the task context structure.
1757
1757
void freeStructPtr ();
1758
1758
1759
- MutableArrayRef<llvm::Value *> getLLVMPrivateVars () {
1760
- return llvmPrivateVars ;
1759
+ MutableArrayRef<llvm::Value *> getLLVMPrivateVarGEPs () {
1760
+ return llvmPrivateVarGEPs ;
1761
1761
}
1762
1762
1763
1763
llvm::Value *getStructPtr () { return structPtr; }
@@ -1772,7 +1772,7 @@ class TaskContextStructManager {
1772
1772
1773
1773
// / LLVM values for each private variable, or null if that private variable is
1774
1774
// / not included in the task context structure
1775
- SmallVector<llvm::Value *> llvmPrivateVars ;
1775
+ SmallVector<llvm::Value *> llvmPrivateVarGEPs ;
1776
1776
1777
1777
// / A pointer to the structure containing context for this task.
1778
1778
llvm::Value *structPtr = nullptr ;
@@ -1816,19 +1816,19 @@ void TaskContextStructManager::createGEPsToPrivateVars() {
1816
1816
}
1817
1817
1818
1818
// Create GEPs for each struct member
1819
- llvmPrivateVars .clear ();
1820
- llvmPrivateVars .reserve (privateDecls.size ());
1819
+ llvmPrivateVarGEPs .clear ();
1820
+ llvmPrivateVarGEPs .reserve (privateDecls.size ());
1821
1821
llvm::Value *zero = builder.getInt32 (0 );
1822
1822
unsigned i = 0 ;
1823
1823
for (auto privDecl : privateDecls) {
1824
1824
if (!privDecl.readsFromMold ()) {
1825
1825
// Handle this inside of the task so we don't pass unnessecary vars in
1826
- llvmPrivateVars .push_back (nullptr );
1826
+ llvmPrivateVarGEPs .push_back (nullptr );
1827
1827
continue ;
1828
1828
}
1829
1829
llvm::Value *iVal = builder.getInt32 (i);
1830
1830
llvm::Value *gep = builder.CreateGEP (structTy, structPtr, {zero, iVal});
1831
- llvmPrivateVars .push_back (gep);
1831
+ llvmPrivateVarGEPs .push_back (gep);
1832
1832
i += 1 ;
1833
1833
}
1834
1834
}
@@ -1923,7 +1923,7 @@ convertOmpTaskOp(omp::TaskOp taskOp, llvm::IRBuilderBase &builder,
1923
1923
1924
1924
for (auto [privDecl, mlirPrivVar, blockArg, llvmPrivateVarAlloc] :
1925
1925
llvm::zip_equal (privateDecls, mlirPrivateVars, privateBlockArgs,
1926
- taskStructMgr.getLLVMPrivateVars ())) {
1926
+ taskStructMgr.getLLVMPrivateVarGEPs ())) {
1927
1927
if (!privDecl.readsFromMold ())
1928
1928
// to be handled inside the task
1929
1929
continue ;
@@ -1961,7 +1961,7 @@ convertOmpTaskOp(omp::TaskOp taskOp, llvm::IRBuilderBase &builder,
1961
1961
1962
1962
// firstprivate copy region
1963
1963
if (failed (initFirstPrivateVars (builder, moduleTranslation, mlirPrivateVars,
1964
- taskStructMgr.getLLVMPrivateVars (),
1964
+ taskStructMgr.getLLVMPrivateVarGEPs (),
1965
1965
privateDecls, copyBlock)))
1966
1966
return llvm::failure ();
1967
1967
@@ -2004,7 +2004,7 @@ convertOmpTaskOp(omp::TaskOp taskOp, llvm::IRBuilderBase &builder,
2004
2004
// Find and map the addresses of each variable within the task context
2005
2005
// structure
2006
2006
taskStructMgr.createGEPsToPrivateVars ();
2007
- llvm::copy (taskStructMgr.getLLVMPrivateVars (),
2007
+ llvm::copy (taskStructMgr.getLLVMPrivateVarGEPs (),
2008
2008
std::back_inserter (llvmPrivateVars));
2009
2009
for (auto [blockArg, llvmPrivateVar] :
2010
2010
llvm::zip_equal (privateBlockArgs, llvmPrivateVars)) {
0 commit comments