From addb78e927f859778ddd778c4f64a4dd4d6d81e4 Mon Sep 17 00:00:00 2001 From: Christian Sigg Date: Fri, 1 Sep 2023 08:15:20 +0200 Subject: [PATCH] [BACKEND] Fixes for llvm/llvm-project@34a35a8 --- include/triton/Dialect/Triton/IR/TritonOps.td | 5 +---- lib/Dialect/Triton/IR/Ops.cpp | 4 ++-- llvm-hash.txt | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/include/triton/Dialect/Triton/IR/TritonOps.td b/include/triton/Dialect/Triton/IR/TritonOps.td index 69cad2bcf2eb..cbac011d20f6 100644 --- a/include/triton/Dialect/Triton/IR/TritonOps.td +++ b/include/triton/Dialect/Triton/IR/TritonOps.td @@ -6,17 +6,14 @@ include "triton/Dialect/Triton/IR/TritonTypes.td" include "triton/Dialect/Triton/IR/TritonAttrDefs.td" include "triton/Dialect/Triton/IR/TritonInterfaces.td" include "mlir/IR/OpBase.td" -include "mlir/IR/FunctionInterfaces.td" // FunctionOpInterface include "mlir/IR/SymbolInterfaces.td" // SymbolUserOpInterface include "mlir/IR/OpAsmInterface.td" // OpAsmOpInterface include "mlir/Interfaces/CallInterfaces.td" // CallOpInterface include "mlir/Interfaces/CastInterfaces.td" // CastOpInterface -include "mlir/Interfaces/SideEffectInterfaces.td" // Pure include "mlir/Interfaces/ControlFlowInterfaces.td" // BranchOpInterface +include "mlir/Interfaces/FunctionInterfaces.td" // FunctionOpInterface include "mlir/Interfaces/InferTypeOpInterface.td" // SameOperandsAndResultType include "mlir/Interfaces/SideEffectInterfaces.td" // Pure -include "mlir/Interfaces/CastInterfaces.td" // CastOpInterface -include "mlir/Interfaces/CallInterfaces.td" // CallOpInterface // // Op Base diff --git a/lib/Dialect/Triton/IR/Ops.cpp b/lib/Dialect/Triton/IR/Ops.cpp index 2d7bec31cf82..d392544ef52a 100644 --- a/lib/Dialect/Triton/IR/Ops.cpp +++ b/lib/Dialect/Triton/IR/Ops.cpp @@ -1,9 +1,9 @@ #include "mlir/IR/Builders.h" #include "mlir/IR/BuiltinAttributes.h" #include "mlir/IR/BuiltinTypes.h" -#include "mlir/IR/FunctionImplementation.h" -#include "mlir/IR/FunctionInterfaces.h" #include "mlir/IR/OperationSupport.h" +#include "mlir/Interfaces/FunctionImplementation.h" +#include "mlir/Interfaces/FunctionInterfaces.h" #include "triton/Dialect/Triton/IR/Dialect.h" #include "triton/Dialect/Triton/IR/Types.h" diff --git a/llvm-hash.txt b/llvm-hash.txt index 502b75e2f529..23d7b4fb0896 100644 --- a/llvm-hash.txt +++ b/llvm-hash.txt @@ -1 +1 @@ -b126ee65fcbb49054e32fd11fdac07279d00f159 +34a35a8b244243f5a4ad5d531007bccfeaa0b02e