From c87fbf886ea9fb1e93c5388f8fba2391ca1220d6 Mon Sep 17 00:00:00 2001 From: Yan Chunwei Date: Tue, 29 Nov 2022 09:06:06 +0800 Subject: [PATCH] [Triton-MLIR][BACKEND] Remove static and unnamed namespace in Utility.h (#923) Reference https://wiki.sei.cmu.edu/confluence/display/cplusplus/DCL59-CPP.+Do+not+define+an+unnamed+namespace+in+a+header+file --- lib/Conversion/TritonGPUToLLVM/Utility.h | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/lib/Conversion/TritonGPUToLLVM/Utility.h b/lib/Conversion/TritonGPUToLLVM/Utility.h index 9deb7198f..888a572dc 100644 --- a/lib/Conversion/TritonGPUToLLVM/Utility.h +++ b/lib/Conversion/TritonGPUToLLVM/Utility.h @@ -113,10 +113,11 @@ namespace mlir { namespace LLVM { +using namespace mlir::triton; -static Value getStructFromElements(Location loc, ValueRange resultVals, - ConversionPatternRewriter &rewriter, - Type structType) { +Value getStructFromElements(Location loc, ValueRange resultVals, + ConversionPatternRewriter &rewriter, + Type structType) { if (!structType.isa()) { return *resultVals.begin(); } @@ -130,9 +131,8 @@ static Value getStructFromElements(Location loc, ValueRange resultVals, return llvmStruct; } -static SmallVector -getElementsFromStruct(Location loc, Value llvmStruct, - ConversionPatternRewriter &rewriter) { +SmallVector getElementsFromStruct(Location loc, Value llvmStruct, + ConversionPatternRewriter &rewriter) { if (llvmStruct.getType().isIntOrIndexOrFloat() || llvmStruct.getType().isa() || llvmStruct.getType().isa()) @@ -147,9 +147,6 @@ getElementsFromStruct(Location loc, Value llvmStruct, return results; } -namespace { -using namespace mlir::triton; - // Create a 32-bit integer constant. Value createConstantI32(Location loc, PatternRewriter &rewriter, int32_t v) { auto i32ty = rewriter.getIntegerType(32); @@ -185,10 +182,8 @@ Value createLLVMIntegerConstant(OpBuilder &builder, Location loc, short width, builder.getIntegerAttr(ty, value)); } -} // namespace - /// Helper function to get strides from a given shape and its order -static SmallVector +SmallVector getStridesFromShapeAndOrder(ArrayRef shape, ArrayRef order, Location loc, ConversionPatternRewriter &rewriter) { auto rank = shape.size(); @@ -264,7 +259,7 @@ struct SharedMemoryObject { } }; -static SharedMemoryObject +SharedMemoryObject getSharedMemoryObjectFromStruct(Location loc, Value llvmStruct, ConversionPatternRewriter &rewriter) { auto elems = getElementsFromStruct(loc, llvmStruct, rewriter);