Skip to content

Commit cd43162

Browse files
author
Longsheng Du
committed
rebase
1 parent dd69e61 commit cd43162

File tree

15 files changed

+489
-3
lines changed

15 files changed

+489
-3
lines changed

‎CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ target_include_directories(graph_compiler PUBLIC ${GC_LIB_INCLUDES})
5252
set(GC_LIB_LINKED_LIBS
5353
MLIRLinalgx
5454
MLIRMicrokernel
55-
MLIROnednnGraph
55+
MLIROneDNNGraph
5656
)
5757
target_link_libraries(graph_compiler PRIVATE ${GC_LIB_LINKED_LIBS})
5858

‎include/gc/Dialect/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
add_subdirectory(OnednnGraph)
1+
add_subdirectory(OneDNNGraph)
22
add_subdirectory(Microkernel)
33
add_subdirectory(Linalgx)

‎include/gc/Dialect/OneDNNGraph/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
add_mlir_dialect(OneDNNGraphOps onednn_graph)
2+
add_mlir_doc(OneDNNGraphOps OneDNNGraphOps gc-dialects/OneDNNGraph/ -gen-op-doc)
3+
add_mlir_doc(OneDNNGraphDialect OneDNNGraphDialect gc-dialects/OneDNNGraph/ -gen-dialect-doc)

‎include/gc/Dialect/OneDNNGraph/OneDNNGraphDialect.h

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
//===- OneDNNGraphDialect.h - OneDNN input dialect --------------*- C++ -*-===//
2+
//
3+
// This file is licensed under the Apache License v2.0 with LLVM Exceptions.
4+
// See https://llvm.org/LICENSE.txt for license information.
5+
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6+
//
7+
//===----------------------------------------------------------------------===//
8+
9+
#ifndef GC_DIALECTS_ONEDNNGRAPHDIALECT_H
10+
#define GC_DIALECTS_ONEDNNGRAPHDIALECT_H
11+
12+
#include "mlir/IR/Dialect.h"
13+
#include "mlir/IR/OpDefinition.h"
14+
#include "mlir/IR/OpImplementation.h"
15+
16+
#define GET_OP_CLASSES
17+
#include "gc-dialects/OneDNNGraph/OneDNNGraphOpsDialect.h.inc"
18+
19+
#endif // GC_DIALECTS_ONEDNNGRAPHDIALECT_H

‎include/gc/Dialect/OneDNNGraph/OneDNNGraphDialect.td

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
//===- OneDNNGraphDialect.td - OneDNN input dialect --------*- tablegen -*-===//
2+
//
3+
// This file is licensed under the Apache License v2.0 with LLVM Exceptions.
4+
// See https://llvm.org/LICENSE.txt for license information.
5+
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6+
//
7+
//===----------------------------------------------------------------------===//
8+
9+
#ifndef ONEDNNGRAPH_DIALECT
10+
#define ONEDNNGRAPH_DIALECT
11+
12+
include "mlir/IR/OpBase.td"
13+
14+
//===----------------------------------------------------------------------===//
15+
// OneDNNGraph dialect definition.
16+
//===----------------------------------------------------------------------===//
17+
18+
def OneDNNGraphDialect : Dialect {
19+
let name = "onednn_graph";
20+
let summary = "A dialect for oneDNN Graph.";
21+
let description = [{
22+
This dialect follows oneDNN Graph Specification.
23+
}];
24+
let cppNamespace = "::mlir::onednn_graph";
25+
}
26+
27+
#endif // ONEDNNGRAPH_DIALECT

‎include/gc/Dialect/OneDNNGraph/OneDNNGraphOps.h

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
//===- OneDNNGraphOps.h - OneDNN input dialect ops --------------*- C++ -*-===//
2+
//
3+
// This file is licensed under the Apache License v2.0 with LLVM Exceptions.
4+
// See https://llvm.org/LICENSE.txt for license information.
5+
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6+
//
7+
//===----------------------------------------------------------------------===//
8+
9+
#ifndef GC_DIALECTS_ONEDNNGRAPHOPS_H
10+
#define GC_DIALECTS_ONEDNNGRAPHOPS_H
11+
12+
#include "mlir/Dialect/Bufferization/IR/BufferizableOpInterface.h"
13+
#include "mlir/Dialect/Tensor/IR/Tensor.h"
14+
#include "mlir/IR/BuiltinTypes.h"
15+
#include "mlir/IR/Dialect.h"
16+
#include "mlir/IR/OpDefinition.h"
17+
#include "mlir/Interfaces/InferTypeOpInterface.h"
18+
#include "mlir/Interfaces/SideEffectInterfaces.h"
19+
20+
#define GET_OP_CLASSES
21+
#include "gc-dialects/OneDNNGraph/OneDNNGraphOps.h.inc"
22+
23+
#endif // GC_DIALECTS_ONEDNNGRAPHOPS_H

‎include/gc/Dialect/OneDNNGraph/OneDNNGraphOps.td

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
//===- OneDNNGraphOps.td - OneDNN input dialect ops --------*- tablegen -*-===//
2+
//
3+
// This file is licensed under the Apache License v2.0 with LLVM Exceptions.
4+
// See https://llvm.org/LICENSE.txt for license information.
5+
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6+
//
7+
//===----------------------------------------------------------------------===//
8+
9+
#ifndef ONEDNNGRAPH_OPS
10+
#define ONEDNNGRAPH_OPS
11+
12+
include "mlir/Interfaces/InferTypeOpInterface.td"
13+
include "mlir/Interfaces/SideEffectInterfaces.td"
14+
include "mlir/Interfaces/DestinationStyleOpInterface.td"
15+
include "mlir/IR/AttrTypeBase.td"
16+
include "mlir/IR/OpBase.td"
17+
include "OneDNNGraphDialect.td"
18+
include "OneDNNGraphTypes.td"
19+
20+
//===----------------------------------------------------------------------===//
21+
// Base OneDNNGraph operation definition.
22+
//===----------------------------------------------------------------------===//
23+
24+
class OneDNNGraph_Op<string mnemonic, list<Trait> traits = []> :
25+
Op<OneDNNGraphDialect, mnemonic, traits>;
26+
27+
class OneDNNGraph_ElemwiseBinaryOp<string mnemonic, list<Trait> traits = []> :
28+
OneDNNGraph_Op<mnemonic, traits # [SameOperandsAndResultElementType, InferTensorType]> {
29+
let arguments = (ins OneDNNGraph_LogicalTensor:$input_0,
30+
OneDNNGraph_LogicalTensor:$input_1);
31+
let results = (outs OneDNNGraph_LogicalTensor:$result);
32+
33+
let assemblyFormat =
34+
"operands attr-dict `:` functional-type(operands, results)";
35+
}
36+
37+
class OneDNNGraph_ElemwiseUnaryOp<string mnemonic, list<Trait> traits = []> :
38+
OneDNNGraph_Op<mnemonic, traits # [SameOperandsAndResultType]> {
39+
let arguments = (ins OneDNNGraph_LogicalTensor:$operand);
40+
let results = (outs OneDNNGraph_LogicalTensor:$result);
41+
42+
let assemblyFormat =
43+
"operands attr-dict `:` functional-type(operands, results)";
44+
}
45+
46+
//===----------------------------------------------------------------------===//
47+
// OneDNNGraph op definitions
48+
//===----------------------------------------------------------------------===//
49+
50+
def OneDNNGraph_MatMulOp :
51+
OneDNNGraph_Op<"matmul", [SameOperandsAndResultElementType, InferTensorTypeAdaptor]> {
52+
let summary = "Generalized matrix multiplication";
53+
let description = [{
54+
`https://spec.oneapi.io/onednn-graph/latest/ops/matrix/MatMul_1.html`
55+
}];
56+
57+
let arguments = (ins OneDNNGraph_LogicalTensor:$input_a,
58+
OneDNNGraph_LogicalTensor:$input_b,
59+
Optional<OneDNNGraph_LogicalTensor>:$bias,
60+
DefaultValuedAttr<BoolAttr, "false">:$transpose_a,
61+
DefaultValuedAttr<BoolAttr, "false">:$transpose_b);
62+
let results = (outs OneDNNGraph_LogicalTensor:$result);
63+
64+
let assemblyFormat =
65+
"operands attr-dict `:` functional-type(operands, results)";
66+
}
67+
68+
def OneDNNGraph_ReLUOp : OneDNNGraph_ElemwiseUnaryOp<"relu"> {
69+
let summary = "element-wise relu";
70+
let description = [{
71+
`https://spec.oneapi.io/onednn-graph/latest/ops/activation/ReLU_1.html`
72+
}];
73+
}
74+
75+
def OneDNNGraph_AddOp : OneDNNGraph_ElemwiseBinaryOp<"add", [Commutative]> {
76+
let summary = "element-wise addition with multi-directional broadcast";
77+
let description = [{
78+
`https://spec.oneapi.io/onednn-graph/latest/ops/arithmetic/Add_1.html`
79+
}];
80+
}
81+
82+
#endif // ONEDNNGRAPH_OPS

‎include/gc/Dialect/OneDNNGraph/OneDNNGraphTypes.h

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
//===- OneDNNGraphTypes.h - OneDNN input dialect types ----------*- C++ -*-===//
2+
//
3+
// This file is licensed under the Apache License v2.0 with LLVM Exceptions.
4+
// See https://llvm.org/LICENSE.txt for license information.
5+
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6+
//
7+
//===----------------------------------------------------------------------===//
8+
9+
#ifndef ONEDNNGRAPH_ONEDNNGRAPHTYPES_H
10+
#define ONEDNNGRAPH_ONEDNNGRAPHTYPES_H
11+
12+
#include "mlir/IR/BuiltinTypes.h"
13+
14+
#define GET_TYPEDEF_CLASSES
15+
#include "gc-dialects/OneDNNGraph/OneDNNGraphOpsTypes.h.inc"
16+
17+
#endif // ONEDNNGRAPH_ONEDNNGRAPHTYPES_H

‎include/gc/Dialect/OneDNNGraph/OneDNNGraphTypes.td

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
//===- OneDNNGraphTypes.h - OneDNN input dialect types -----*- tablegen -*-===//
2+
//
3+
// This file is licensed under the Apache License v2.0 with LLVM Exceptions.
4+
// See https://llvm.org/LICENSE.txt for license information.
5+
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6+
//
7+
//===----------------------------------------------------------------------===//
8+
9+
#ifndef ONEDNNGRAPH_TYPES
10+
#define ONEDNNGRAPH_TYPES
11+
12+
include "mlir/IR/BuiltinTypes.td"
13+
include "mlir/IR/AttrTypeBase.td"
14+
include "OneDNNGraphDialect.td"
15+
16+
//===----------------------------------------------------------------------===//
17+
// OneDNNGraph type definitions
18+
//===----------------------------------------------------------------------===//
19+
20+
def OneDNNGraph_DataType : AnyTypeOf<[
21+
F16,
22+
BF16,
23+
F32,
24+
SI<32>,
25+
SI<8>,
26+
UI<8>]>;
27+
28+
def OneDNNGraph_LogicalTensor : TensorOf<[OneDNNGraph_DataType]>;
29+
30+
#endif // ONEDNNGRAPH_TYPES

‎lib/gc/Dialect/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
add_subdirectory(Linalgx)
22
add_subdirectory(Microkernel)
3-
add_subdirectory(OnednnGraph)
3+
add_subdirectory(OneDNNGraph)

‎lib/gc/Dialect/OneDNNGraph/CMakeLists.txt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
add_mlir_dialect_library(MLIROneDNNGraph
2+
OneDNNGraphDialect.cpp
3+
OneDNNGraphOps.cpp
4+
5+
ADDITIONAL_HEADER_DIRS
6+
${PROJECT_SOURCE_DIR}/include/gc-dialects/OneDNNGraph
7+
8+
DEPENDS
9+
MLIROneDNNGraphOpsIncGen
10+
11+
LINK_LIBS PUBLIC
12+
MLIRIR
13+
)

‎lib/gc/Dialect/OneDNNGraph/OneDNNGraphDialect.cpp

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
//===- OneDNNGraphDialect.h - OneDNN input dialect --------------*- C++ -*-===//
2+
//
3+
// This file is licensed under the Apache License v2.0 with LLVM Exceptions.
4+
// See https://llvm.org/LICENSE.txt for license information.
5+
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6+
//
7+
//===----------------------------------------------------------------------===//
8+
9+
#include "gc-dialects/OneDNNGraph/OneDNNGraphDialect.h"
10+
#include "gc-dialects/OneDNNGraph/OneDNNGraphOps.h"
11+
#include "gc-dialects/OneDNNGraph/OneDNNGraphTypes.h"
12+
13+
#include "mlir/Dialect/Quant/QuantOps.h"
14+
#include "mlir/Dialect/Tensor/IR/Tensor.h"
15+
#include "mlir/Dialect/Tosa/IR/TosaOps.h"
16+
#include "mlir/Dialect/Tosa/Utils/QuantUtils.h"
17+
#include "mlir/Dialect/Tosa/Utils/ShapeUtils.h"
18+
#include "mlir/Dialect/Utils/IndexingUtils.h"
19+
#include "mlir/IR/BuiltinTypes.h"
20+
#include "mlir/IR/DialectImplementation.h"
21+
#include "mlir/IR/Matchers.h"
22+
#include "mlir/IR/PatternMatch.h"
23+
#include "mlir/IR/TypeUtilities.h"
24+
#include "mlir/Interfaces/InferTypeOpInterface.h"
25+
#include "mlir/Transforms/InliningUtils.h"
26+
#include "llvm/ADT/APFloat.h"
27+
#include "llvm/ADT/DenseMap.h"
28+
#include "llvm/ADT/TypeSwitch.h"
29+
30+
using namespace mlir;
31+
using namespace mlir::onednn_graph;
32+
33+
#include "gc-dialects/OneDNNGraph/OneDNNGraphOpsDialect.cpp.inc"
34+
35+
//===----------------------------------------------------------------------===//
36+
// OneDNNGraph dialect.
37+
//===----------------------------------------------------------------------===//
38+
39+
void OneDNNGraphDialect::initialize() {
40+
addOperations<
41+
#define GET_OP_LIST
42+
#include "gc-dialects/OneDNNGraph/OneDNNGraphOps.cpp.inc"
43+
>();
44+
}

0 commit comments

Comments
 (0)