gaspersic/triton
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Triton-MLIR][BACKEND] Remove static and unnamed namespace in Utility.h (#923)

Browse Source 
Reference
https://wiki.sei.cmu.edu/confluence/display/cplusplus/DCL59-CPP.+Do+not+define+an+unnamed+namespace+in+a+header+file
This commit is contained in:
Yan Chunwei
2022-11-29 09:06:06 +08:00
committed by GitHub
parent 0c1d4d764e
commit c87fbf886e
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/Conversion/TritonGPUToLLVM/Utility.h
View File

@@ -113,10 +113,11 @@
namespace mlir { namespace mlir {
namespace LLVM { namespace LLVM {
using namespace mlir::triton;
static Value getStructFromElements(Location loc, ValueRange resultVals, Value getStructFromElements(Location loc, ValueRange resultVals,
ConversionPatternRewriter &rewriter, ConversionPatternRewriter &rewriter,
Type structType) { Type structType) {
if (!structType.isa<LLVM::LLVMStructType>()) { if (!structType.isa<LLVM::LLVMStructType>()) {
return *resultVals.begin(); return *resultVals.begin();
} }
@@ -130,9 +131,8 @@ static Value getStructFromElements(Location loc, ValueRange resultVals,
return llvmStruct; return llvmStruct;
} }
static SmallVector<Value> SmallVector<Value> getElementsFromStruct(Location loc, Value llvmStruct,
getElementsFromStruct(Location loc, Value llvmStruct, ConversionPatternRewriter &rewriter) {
ConversionPatternRewriter &rewriter) {
if (llvmStruct.getType().isIntOrIndexOrFloat() || if (llvmStruct.getType().isIntOrIndexOrFloat() ||
llvmStruct.getType().isa<triton::PointerType>() || llvmStruct.getType().isa<triton::PointerType>() ||
llvmStruct.getType().isa<LLVM::LLVMPointerType>()) llvmStruct.getType().isa<LLVM::LLVMPointerType>())
@@ -147,9 +147,6 @@ getElementsFromStruct(Location loc, Value llvmStruct,
return results; return results;
} }
namespace {
using namespace mlir::triton;
// Create a 32-bit integer constant. // Create a 32-bit integer constant.
Value createConstantI32(Location loc, PatternRewriter &rewriter, int32_t v) { Value createConstantI32(Location loc, PatternRewriter &rewriter, int32_t v) {
auto i32ty = rewriter.getIntegerType(32); auto i32ty = rewriter.getIntegerType(32);
@@ -185,10 +182,8 @@ Value createLLVMIntegerConstant(OpBuilder &builder, Location loc, short width,
builder.getIntegerAttr(ty, value)); builder.getIntegerAttr(ty, value));
} }
} // namespace
/// Helper function to get strides from a given shape and its order /// Helper function to get strides from a given shape and its order
static SmallVector<Value> SmallVector<Value>
getStridesFromShapeAndOrder(ArrayRef<int64_t> shape, ArrayRef<unsigned> order, getStridesFromShapeAndOrder(ArrayRef<int64_t> shape, ArrayRef<unsigned> order,
Location loc, ConversionPatternRewriter &rewriter) { Location loc, ConversionPatternRewriter &rewriter) {
auto rank = shape.size(); auto rank = shape.size();
@@ -264,7 +259,7 @@ struct SharedMemoryObject {
} }
}; };
static SharedMemoryObject SharedMemoryObject
getSharedMemoryObjectFromStruct(Location loc, Value llvmStruct, getSharedMemoryObjectFromStruct(Location loc, Value llvmStruct,
ConversionPatternRewriter &rewriter) { ConversionPatternRewriter &rewriter) {
auto elems = getElementsFromStruct(loc, llvmStruct, rewriter); auto elems = getElementsFromStruct(loc, llvmStruct, rewriter);