[Dialect] fix several bugs

This commit is contained in:
Hanchen Ye 2021-05-01 01:06:35 -05:00
parent 10179b4a8c
commit c3deb43ee8
6 changed files with 2 additions and 41 deletions

View File

@ -9,8 +9,3 @@ set(LLVM_TARGET_DEFINITIONS HLSCpp.td)
mlir_tablegen(HLSCppAttributes.h.inc -gen-attrdef-decls)
mlir_tablegen(HLSCppAttributes.cpp.inc -gen-attrdef-defs)
add_public_tablegen_target(MLIRHLSCppAttributesIncGen)
set(LLVM_TARGET_DEFINITIONS Interfaces.td)
mlir_tablegen(HLSCppInterfaces.h.inc -gen-op-interface-decls)
mlir_tablegen(HLSCppInterfaces.cpp.inc -gen-op-interface-defs)
add_public_tablegen_target(MLIRHLSCppInterfacesIncGen)

View File

@ -11,38 +11,18 @@
#include "mlir/IR/OpDefinition.h"
#include "mlir/Interfaces/SideEffectInterfaces.h"
//===----------------------------------------------------------------------===//
// HLSCpp definition
//===----------------------------------------------------------------------===//
namespace mlir {
namespace scalehls {
namespace hlscpp {
enum class MemoryKind {
BRAM_1P = 0,
BRAM_S2P = 1,
BRAM_T2P = 2,
// URAM_1P = 3,
// URAM_S2P = 4,
// URAM_T2P = 5,
DRAM = 3
};
enum class MemoryKind { BRAM_1P = 0, BRAM_S2P = 1, BRAM_T2P = 2, DRAM = 3 };
enum class PartitionKind { CYCLIC = 0, BLOCK = 1, NONE = 2 };
#include "scalehls/Dialect/HLSCpp/HLSCppInterfaces.h.inc"
} // namespace hlscpp
} // namespace scalehls
} // namespace mlir
//===----------------------------------------------------------------------===//
// Include tablegen classes
//===----------------------------------------------------------------------===//
#include "scalehls/Dialect/HLSCpp/HLSCppDialect.h.inc"
#include "scalehls/Dialect/HLSCpp/HLSCppEnums.h.inc"

View File

@ -1,12 +0,0 @@
//===----------------------------------------------------------------------===//
//
// Copyright 2020-2021 The ScaleHLS Authors.
//
//===----------------------------------------------------------------------===//
#ifndef SCALEHLS_DIALECT_HLSCPP_INTERFACES_TD
#define SCALEHLS_DIALECT_HLSCPP_INTERFACES_TD
include "mlir/IR/OpBase.td"
#endif // SCALEHLS_DIALECT_HLSCPP_INTERFACES_TD

View File

@ -5,7 +5,6 @@ add_mlir_dialect_library(MLIRHLSCpp
DEPENDS
MLIRHLSCppIncGen
MLIRHLSCppInterfacesIncGen
MLIRHLSCppEnumsIncGen
MLIRHLSCppAttributesIncGen
)

View File

@ -227,7 +227,6 @@ void CastOp::getCanonicalizationPatterns(RewritePatternSet &results,
//===----------------------------------------------------------------------===//
#include "scalehls/Dialect/HLSCpp/HLSCppEnums.cpp.inc"
#include "scalehls/Dialect/HLSCpp/HLSCppInterfaces.cpp.inc"
#define GET_OP_CLASSES
#include "scalehls/Dialect/HLSCpp/HLSCpp.cpp.inc"

View File

@ -19,7 +19,7 @@ void HLSKernelDialect::initialize() {
>();
}
#include "scalehls/Dialect/HLSCpp/HLSCppInterfaces.cpp.inc"
#include "scalehls/Dialect/HLSKernel/HLSKernelInterfaces.cpp.inc"
//===----------------------------------------------------------------------===//
// Utilities