[mlir][emitc] Expose emitc dialect types #119645

TGMM · 2024-12-12T01:38:42Z

Added C API functions for the EmitC dialect types.

llvmbot · 2024-12-12T01:39:17Z

@llvm/pr-subscribers-mlir-emitc

@llvm/pr-subscribers-mlir

Author: Eliud de León (TGMM)

Changes

Added C API functions for the EmitC dialect types.

Full diff: https://github.com/llvm/llvm-project/pull/119645.diff

2 Files Affected:

(modified) mlir/include/mlir-c/Dialect/EmitC.h (+62)
(modified) mlir/lib/CAPI/Dialect/EmitC.cpp (+100)

diff --git a/mlir/include/mlir-c/Dialect/EmitC.h b/mlir/include/mlir-c/Dialect/EmitC.h
index 82e698344bf1e7..384e695e429ef0 100644
--- a/mlir/include/mlir-c/Dialect/EmitC.h
+++ b/mlir/include/mlir-c/Dialect/EmitC.h
@@ -19,6 +19,68 @@ extern "C" {
 
 MLIR_DECLARE_CAPI_DIALECT_REGISTRATION(EmitC, emitc);
 
+//===---------------------------------------------------------------------===//
+// ArrayType
+//===---------------------------------------------------------------------===//
+
+MLIR_CAPI_EXPORTED bool mlirTypeIsAEmitCArrayType(MlirType type);
+
+MLIR_CAPI_EXPORTED MlirTypeID mlirEmitCArrayTypeGetTypeID(void);
+
+MLIR_CAPI_EXPORTED MlirType mlirEmitCArrayTypeGet(intptr_t nDims,
+                                                  int64_t *shape,
+                                                  MlirType elementType);
+//===---------------------------------------------------------------------===//
+// OpaqueType
+//===---------------------------------------------------------------------===//
+
+MLIR_CAPI_EXPORTED bool mlirTypeIsAEmitCOpaqueType(MlirType type);
+
+MLIR_CAPI_EXPORTED MlirTypeID mlirEmitCOpaqueTypeGetTypeID(void);
+
+MLIR_CAPI_EXPORTED MlirType mlirEmitCOpaqueTypeGet(MlirContext ctx,
+                                                   MlirStringRef value);
+
+//===---------------------------------------------------------------------===//
+// PointerType
+//===---------------------------------------------------------------------===//
+
+MLIR_CAPI_EXPORTED bool mlirTypeIsAEmitCPointerType(MlirType type);
+
+MLIR_CAPI_EXPORTED MlirTypeID mlirEmitCPointerTypeGetTypeID(void);
+
+MLIR_CAPI_EXPORTED MlirType mlirEmitCPointerTypeGet(MlirType pointee);
+
+//===---------------------------------------------------------------------===//
+// PtrDiffTType
+//===---------------------------------------------------------------------===//
+
+MLIR_CAPI_EXPORTED bool mlirTypeIsAEmitCPtrDiffTType(MlirType type);
+
+MLIR_CAPI_EXPORTED MlirTypeID mlirEmitCPtrDiffTTypeGetTypeID(void);
+
+MLIR_CAPI_EXPORTED MlirType mlirEmitCPtrDiffTTypeGet(MlirContext ctx);
+
+//===---------------------------------------------------------------------===//
+// SignedSizeTType
+//===---------------------------------------------------------------------===//
+
+MLIR_CAPI_EXPORTED bool mlirTypeIsAEmitCSignedSizeTType(MlirType type);
+
+MLIR_CAPI_EXPORTED MlirTypeID mlirEmitCSignedSizeTTypeGetTypeID(void);
+
+MLIR_CAPI_EXPORTED MlirType mlirEmitCSignedSizeTTypeGet(MlirContext ctx);
+
+//===---------------------------------------------------------------------===//
+// SizeTType
+//===---------------------------------------------------------------------===//
+
+MLIR_CAPI_EXPORTED bool mlirTypeIsAEmitCSizeTType(MlirType type);
+
+MLIR_CAPI_EXPORTED MlirTypeID mlirEmitCSizeTTypeGetTypeID(void);
+
+MLIR_CAPI_EXPORTED MlirType mlirEmitCSizeTTypeGet(MlirContext ctx);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/mlir/lib/CAPI/Dialect/EmitC.cpp b/mlir/lib/CAPI/Dialect/EmitC.cpp
index 3dcb7038a57981..57619ff776843d 100644
--- a/mlir/lib/CAPI/Dialect/EmitC.cpp
+++ b/mlir/lib/CAPI/Dialect/EmitC.cpp
@@ -10,4 +10,104 @@
 #include "mlir/CAPI/Registration.h"
 #include "mlir/Dialect/EmitC/IR/EmitC.h"
 
+using namespace mlir;
+
 MLIR_DEFINE_CAPI_DIALECT_REGISTRATION(EmitC, emitc, mlir::emitc::EmitCDialect)
+
+//===---------------------------------------------------------------------===//
+// ArrayType
+//===---------------------------------------------------------------------===//
+
+bool mlirTypeIsAEmitCArrayType(MlirType type) {
+  return isa<emitc::ArrayType>(unwrap(type));
+}
+
+MlirTypeID mlirEmitCArrayTypeGetTypeID(void) {
+  return wrap(emitc::ArrayType::getTypeID());
+}
+
+MlirType mlirEmitCArrayTypeGet(intptr_t nDims, int64_t *shape,
+                               MlirType elementType) {
+  return wrap(
+      emitc::ArrayType::get(llvm::ArrayRef(shape, nDims), unwrap(elementType)));
+}
+
+//===---------------------------------------------------------------------===//
+// OpaqueType
+//===---------------------------------------------------------------------===//
+
+bool mlirTypeIsAEmitCOpaqueType(MlirType type) {
+  return isa<emitc::OpaqueType>(unwrap(type));
+}
+
+MlirTypeID mlirEmitCOpaqueTypeGetTypeID(void) {
+  return wrap(emitc::OpaqueType::getTypeID());
+}
+
+MlirType mlirEmitCOpaqueTypeGet(MlirContext ctx, MlirStringRef value) {
+  return wrap(emitc::OpaqueType::get(unwrap(ctx), unwrap(value)));
+}
+
+//===---------------------------------------------------------------------===//
+// PointerType
+//===---------------------------------------------------------------------===//
+
+bool mlirTypeIsAEmitCPointerType(MlirType type) {
+  return isa<emitc::PointerType>(unwrap(type));
+}
+
+MlirTypeID mlirEmitCPointerTypeGetTypeID(void) {
+  return wrap(emitc::PointerType::getTypeID());
+}
+
+MlirType mlirEmitCPointerTypeGet(MlirType pointee) {
+  return wrap(emitc::PointerType::get(unwrap(pointee)));
+}
+
+//===---------------------------------------------------------------------===//
+// PtrDiffTType
+//===---------------------------------------------------------------------===//
+
+bool mlirTypeIsAEmitCPtrDiffTType(MlirType type) {
+  return isa<emitc::PtrDiffTType>(unwrap(type));
+}
+
+MlirTypeID mlirEmitCPtrDiffTTypeGetTypeID(void) {
+  return wrap(emitc::PtrDiffTType::getTypeID());
+}
+
+MlirType mlirEmitCPtrDiffTTypeGet(MlirContext ctx) {
+  return wrap(emitc::PtrDiffTType::get(unwrap(ctx)));
+}
+
+//===---------------------------------------------------------------------===//
+// SignedSizeTType
+//===---------------------------------------------------------------------===//
+
+bool mlirTypeIsAEmitCSignedSizeTType(MlirType type) {
+  return isa<emitc::SignedSizeTType>(unwrap(type));
+}
+
+MlirTypeID mlirEmitCSignedSizeTTypeGetTypeID(void) {
+  return wrap(emitc::SignedSizeTType::getTypeID());
+}
+
+MlirType mlirEmitCSignedSizeTTypeGet(MlirContext ctx) {
+  return wrap(emitc::SignedSizeTType::get(unwrap(ctx)));
+}
+
+//===---------------------------------------------------------------------===//
+// SizeTType
+//===---------------------------------------------------------------------===//
+
+bool mlirTypeIsAEmitCSizeTType(MlirType type) {
+  return isa<emitc::SizeTType>(unwrap(type));
+}
+
+MlirTypeID mlirEmitCSizeTTypeGetTypeID(void) {
+  return wrap(emitc::SizeTType::getTypeID());
+}
+
+MlirType mlirEmitCSizeTTypeGet(MlirContext ctx) {
+  return wrap(emitc::SizeTType::get(unwrap(ctx)));
+}

TGMM · 2024-12-12T08:56:37Z

I'm not convinced on the CmpPredicate value casting to uint64_t since it removes useful type information. If there's a better way to expose this enum to C, I'd love to hear it.

TGMM · 2024-12-20T00:24:12Z

Ping

mgehre-amd · 2024-12-20T07:23:18Z

The code looks good to me! Regarding the CmpPredicate, you could do it like here https://github.com/llvm/llvm-project/blob/main/mlir/lib/CAPI/Dialect/SparseTensor.cpp#L23, where the LevelFormat enum in the SparseTensor dialect is mirrored to C.

TGMM · 2024-12-30T04:13:16Z

The code looks good to me! Regarding the CmpPredicate, you could do it like here https://github.com/llvm/llvm-project/blob/main/mlir/lib/CAPI/Dialect/SparseTensor.cpp#L23, where the LevelFormat enum in the SparseTensor dialect is mirrored to C.

Thanks for the suggestion! I've made these changes based off the code that you sent.

mgehre-amd

LGTM!

marbre

I am not familiar with the CAPI but looks pretty good.

mlir/include/mlir-c/Dialect/EmitC.h

TGMM · 2025-01-02T22:04:52Z

Should I do something about the IsA functions? I tried following the naming convention specified in the guidelines, but I do admit it sounds better (more natural) with An instead.

If not, I think this is ready to be merged.

marbre · 2025-01-02T22:24:19Z

Should I do something about the IsA functions? I tried following the naming convention specified in the guidelines, but I do admit it sounds better (more natural) with An instead.

If not, I think this is ready to be merged.

I think IsA is probably fine.

marbre · 2025-01-09T23:07:25Z

If not, I think this is ready to be merged.

Do you want one of us to merge on your behalf?

TGMM · 2025-01-09T23:09:22Z

If not, I think this is ready to be merged.

Do you want one of us to merge on your behalf?

Yes, please!

marbre · 2025-01-13T13:43:17Z

If not, I think this is ready to be merged.

Do you want one of us to merge on your behalf?

Yes, please!

This would be merged with an email address only. Do you want to add your name or is just the email fine for you?

TGMM · 2025-01-14T20:34:03Z

This would be merged with an email address only. Do you want to add your name or is just the email fine for you?

Could you clarify on what you mean by that? I thought it would use my Github info in the merge commit, is that not the case? How would I go on about adding my name? If it's too much trouble, I'm fine with just the email, though.

marbre · 2025-01-14T20:38:48Z

This would be merged with an email address only. Do you want to add your name or is just the email fine for you?

Could you clarify on what you mean by that? I thought it would use my Github info in the merge commit, is that not the case? How would I go on about adding my name? If it's too much trouble, I'm fine with just the email, though.

I think it will be authored as TGMM <[email protected]> (https://patch-diff.githubusercontent.com/raw/llvm/llvm-project/pull/119645.patch) if that's fine for you.

TGMM · 2025-01-14T20:42:45Z

This would be merged with an email address only. Do you want to add your name or is just the email fine for you?

Could you clarify on what you mean by that? I thought it would use my Github info in the merge commit, is that not the case? How would I go on about adding my name? If it's too much trouble, I'm fine with just the email, though.

I think it will be authored as TGMM <[email protected]> (https://patch-diff.githubusercontent.com/raw/llvm/llvm-project/pull/119645.patch) if that's fine for you.

Yeah, that's fine by me. Thanks for the heads up!

marbre · 2025-01-14T20:46:40Z

Yeah, that's fine by me. Thanks for the heads up!

Thanks for your patience and the patch. Merged it.

llvmbot added the mlir label Dec 12, 2024

simon-camp added the mlir:emitc label Dec 12, 2024

marbre assigned marbre, simon-camp and mgehre-amd and unassigned marbre, simon-camp and mgehre-amd Dec 20, 2024

marbre requested review from marbre, mgehre-amd and simon-camp December 20, 2024 09:56

TGMM force-pushed the tgmm/emitc_c_api_types branch from 84f3bc4 to 914575d Compare December 21, 2024 00:41

TGMM added 4 commits December 28, 2024 22:00

[mlir][emitc] Expose emitc dialect types

1e75aa3

Added LValue type to CAPI

f36ca23

Added EmitC attrs to CAPI

dbaf3d9

Changed MlirEmitCCmpPredicate from uint64_t to enum

1b498bd

TGMM force-pushed the tgmm/emitc_c_api_types branch from 0e20365 to 1b498bd Compare December 29, 2024 06:00

mgehre-amd approved these changes Jan 2, 2025

View reviewed changes

marbre reviewed Jan 2, 2025

View reviewed changes

mlir/include/mlir-c/Dialect/EmitC.h Show resolved Hide resolved

marbre merged commit 43491f0 into llvm:main Jan 14, 2025
8 checks passed

[mlir][emitc] Expose emitc dialect types #119645

[mlir][emitc] Expose emitc dialect types #119645

Uh oh!

Conversation

TGMM commented Dec 12, 2024

Uh oh!

llvmbot commented Dec 12, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

TGMM commented Dec 12, 2024

Uh oh!

TGMM commented Dec 20, 2024

Uh oh!

mgehre-amd commented Dec 20, 2024

Uh oh!

TGMM commented Dec 30, 2024

Uh oh!

mgehre-amd left a comment

Choose a reason for hiding this comment

Uh oh!

marbre left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

TGMM commented Jan 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

marbre commented Jan 2, 2025

Uh oh!

marbre commented Jan 9, 2025

Uh oh!

TGMM commented Jan 9, 2025

Uh oh!

marbre commented Jan 13, 2025

Uh oh!

TGMM commented Jan 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

marbre commented Jan 14, 2025

Uh oh!

TGMM commented Jan 14, 2025

Uh oh!

Uh oh!

marbre commented Jan 14, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

llvmbot commented Dec 12, 2024 •

edited

Loading

TGMM commented Jan 2, 2025 •

edited

Loading

TGMM commented Jan 14, 2025 •

edited

Loading