From 8a5647782dd524c7c465cb58127390683950f233 Mon Sep 17 00:00:00 2001 From: Jun Yang Date: Sat, 19 Nov 2022 22:33:59 +0800 Subject: [PATCH] [Triton-MLIR][Testing]Fix tests warning, with small code clean-up (#894) 1.Code clean-up to remove superfluous #includes. 2.Fix two python test warnings, in which one relates to ["#" formats](https://jira.mongodb.org/browse/PYTHON-2343), the other relates to regular expression string usage. --- .../triton/Target/LLVMIR/LLVMIRTranslation.h | 1 + include/triton/Target/PTX/PTXTranslation.h | 1 - lib/Target/LLVMIR/LLVMIRTranslation.cpp | 2 -- lib/Target/PTX/PTXTranslation.cpp | 29 ------------------- python/triton/compiler.py | 3 +- 5 files changed, 3 insertions(+), 33 deletions(-) diff --git a/include/triton/Target/LLVMIR/LLVMIRTranslation.h b/include/triton/Target/LLVMIR/LLVMIRTranslation.h index 2becb6fe5..1b8b399d7 100644 --- a/include/triton/Target/LLVMIR/LLVMIRTranslation.h +++ b/include/triton/Target/LLVMIR/LLVMIRTranslation.h @@ -2,6 +2,7 @@ #define TRITON_TARGET_LLVMIRTRANSLATION_H #include "llvm/ADT/StringRef.h" #include +#include #include namespace llvm { diff --git a/include/triton/Target/PTX/PTXTranslation.h b/include/triton/Target/PTX/PTXTranslation.h index df15edc73..63ea87a5c 100644 --- a/include/triton/Target/PTX/PTXTranslation.h +++ b/include/triton/Target/PTX/PTXTranslation.h @@ -1,7 +1,6 @@ #ifndef TRITON_TARGET_PTXTRANSLATION_H #define TRITON_TARGET_PTXTRANSLATION_H -#include #include namespace llvm { diff --git a/lib/Target/LLVMIR/LLVMIRTranslation.cpp b/lib/Target/LLVMIR/LLVMIRTranslation.cpp index aa73b4f81..54ee54132 100644 --- a/lib/Target/LLVMIR/LLVMIRTranslation.cpp +++ b/lib/Target/LLVMIR/LLVMIRTranslation.cpp @@ -3,11 +3,9 @@ #include "mlir/Dialect/LLVMIR/LLVMDialect.h" #include "mlir/ExecutionEngine/ExecutionEngine.h" #include "mlir/ExecutionEngine/OptUtils.h" -#include "mlir/IR/BuiltinOps.h" #include "mlir/IR/Dialect.h" #include "mlir/Pass/Pass.h" #include "mlir/Pass/PassManager.h" -#include "mlir/Support/LogicalResult.h" #include "mlir/Target/LLVMIR/Dialect/LLVMIR/LLVMToLLVMIRTranslation.h" #include "mlir/Target/LLVMIR/Dialect/NVVM/NVVMToLLVMIRTranslation.h" #include "mlir/Target/LLVMIR/Export.h" diff --git a/lib/Target/PTX/PTXTranslation.cpp b/lib/Target/PTX/PTXTranslation.cpp index d55ce4b44..40846fa86 100644 --- a/lib/Target/PTX/PTXTranslation.cpp +++ b/lib/Target/PTX/PTXTranslation.cpp @@ -1,46 +1,17 @@ #include "triton/Target/PTX/PTXTranslation.h" -#include "mlir/Dialect/LLVMIR/LLVMDialect.h" -#include "mlir/ExecutionEngine/ExecutionEngine.h" -#include "mlir/ExecutionEngine/OptUtils.h" -#include "mlir/IR/BuiltinOps.h" -#include "mlir/IR/Dialect.h" -#include "mlir/Pass/Pass.h" -#include "mlir/Pass/PassManager.h" -#include "mlir/Support/LogicalResult.h" -#include "mlir/Target/LLVMIR/Dialect/LLVMIR/LLVMToLLVMIRTranslation.h" -#include "mlir/Target/LLVMIR/Export.h" -#include "mlir/Target/LLVMIR/LLVMTranslationInterface.h" #include "triton/Target/LLVMIR/LLVMIRTranslation.h" -#include "llvm/ExecutionEngine/ExecutionEngine.h" -#include "llvm/ExecutionEngine/SectionMemoryManager.h" #include "llvm/IR/IRBuilder.h" -#include "llvm/IR/IRPrintingPasses.h" #include "llvm/IR/LegacyPassManager.h" #include "llvm/IR/Module.h" #include "llvm/IR/Verifier.h" #include "llvm/MC/TargetRegistry.h" -#include "llvm/Support/CodeGen.h" -#include "llvm/Support/CommandLine.h" -#include "llvm/Support/SourceMgr.h" #include "llvm/Support/TargetSelect.h" -#include "llvm/Support/raw_ostream.h" #include "llvm/Target/TargetMachine.h" -#include "llvm/Target/TargetOptions.h" -#include "llvm/Transforms/Scalar.h" -#include "llvm/Transforms/Utils/Cloning.h" #include -#include namespace triton { -extern "C" { -int set_curterm(char *nterm) { return 0; } -int del_curterm(char *nterm) { return 0; } -int tigetnum(char *capname) { return 0; } -int setupterm(char *term, int fildes, int *errret) { return 0; } -} - static void init_llvm() { LLVMInitializeNVPTXTargetInfo(); LLVMInitializeNVPTXTarget(); diff --git a/python/triton/compiler.py b/python/triton/compiler.py index 8406be4c8..8da30e4b9 100644 --- a/python/triton/compiler.py +++ b/python/triton/compiler.py @@ -1319,7 +1319,7 @@ def make_stub(name, signature, constants): def convert_type_repr(x): - match = re.search('!tt\.ptr<(.*)>', x) + match = re.search(r'!tt\.ptr<(.*)>', x) if match is not None: return '*' + convert_type_repr(match.group(1)) return x @@ -1490,6 +1490,7 @@ class CudaUtils(object): #include #include \"cuda.h\" + #define PY_SSIZE_T_CLEAN #include static inline void gpuAssert(CUresult code, const char *file, int line)