Skip to content

[MLIR][LLVM] Change CAPI pointer factory to create opaque pointers #70572

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 30, 2023
Merged

[MLIR][LLVM] Change CAPI pointer factory to create opaque pointers #70572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mlir/include/mlir-c/Dialect/LLVM.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ extern "C" {
MLIR_DECLARE_CAPI_DIALECT_REGISTRATION(LLVM, llvm);

/// Creates an llvm.ptr type.
MLIR_CAPI_EXPORTED MlirType mlirLLVMPointerTypeGet(MlirType pointee,
MLIR_CAPI_EXPORTED MlirType mlirLLVMPointerTypeGet(MlirContext ctx,
unsigned addressSpace);

/// Creates an llmv.void type.
Expand Down
4 changes: 2 additions & 2 deletions mlir/lib/CAPI/Dialect/LLVM.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ using namespace mlir::LLVM;

MLIR_DEFINE_CAPI_DIALECT_REGISTRATION(LLVM, llvm, LLVMDialect)

MlirType mlirLLVMPointerTypeGet(MlirType pointee, unsigned addressSpace) {
return wrap(LLVMPointerType::get(unwrap(pointee), addressSpace));
MlirType mlirLLVMPointerTypeGet(MlirContext ctx, unsigned addressSpace) {
return wrap(LLVMPointerType::get(unwrap(ctx), addressSpace));
}

MlirType mlirLLVMVoidTypeGet(MlirContext ctx) {
Expand Down
25 changes: 14 additions & 11 deletions mlir/test/CAPI/llvm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
// RUN: mlir-capi-llvm-test 2>&1 | FileCheck %s

#include "mlir-c/Dialect/LLVM.h"
#include "mlir-c/IR.h"
#include "mlir-c/BuiltinTypes.h"
#include "mlir-c/IR.h"

#include <assert.h>
#include <math.h>
Expand All @@ -26,17 +26,20 @@ static void testTypeCreation(MlirContext ctx) {
MlirType i32 = mlirIntegerTypeGet(ctx, 32);
MlirType i64 = mlirIntegerTypeGet(ctx, 64);

const char *i32p_text = "!llvm.ptr<i32>";
MlirType i32p = mlirLLVMPointerTypeGet(i32, 0);
MlirType i32p_ref = mlirTypeParseGet(ctx, mlirStringRefCreateFromCString(i32p_text));
// CHECK: !llvm.ptr<i32>: 1
fprintf(stderr, "%s: %d\n", i32p_text, mlirTypeEqual(i32p, i32p_ref));
const char *ptr_text = "!llvm.ptr";
MlirType ptr = mlirLLVMPointerTypeGet(ctx, 0);
MlirType ptr_ref =
mlirTypeParseGet(ctx, mlirStringRefCreateFromCString(ptr_text));
// CHECK: !llvm.ptr: 1
fprintf(stderr, "%s: %d\n", ptr_text, mlirTypeEqual(ptr, ptr_ref));

const char *i32p4_text = "!llvm.ptr<i32, 4>";
MlirType i32p4 = mlirLLVMPointerTypeGet(i32, 4);
MlirType i32p4_ref = mlirTypeParseGet(ctx, mlirStringRefCreateFromCString(i32p4_text));
// CHECK: !llvm.ptr<i32, 4>: 1
fprintf(stderr, "%s: %d\n", i32p4_text, mlirTypeEqual(i32p4, i32p4_ref));
const char *ptr_addr_text = "!llvm.ptr<42>";
MlirType ptr_addr = mlirLLVMPointerTypeGet(ctx, 42);
MlirType ptr_addr_ref =
mlirTypeParseGet(ctx, mlirStringRefCreateFromCString(ptr_addr_text));
// CHECK: !llvm.ptr<42>: 1
fprintf(stderr, "%s: %d\n", ptr_addr_text,
mlirTypeEqual(ptr_addr, ptr_addr_ref));

const char *voidt_text = "!llvm.void";
MlirType voidt = mlirLLVMVoidTypeGet(ctx);
Expand Down