unify naming

native/mlir-zig-proj/src/main.zig

@@ -254,7 +254,7 @@ const BeaverPass = struct {
             print("fail to make res: {}\n", .{@TypeOf(op)});
             unreachable;
         };
-        tuple_slice[2] = beam.make_resource(env, pass, mlir_capi.MlirExternalPass.resource.t) catch {
+        tuple_slice[2] = beam.make_resource(env, pass, mlir_capi.ExternalPass.resource.t) catch {
             print("fail to make res: {}\n", .{@TypeOf(pass)});
             unreachable;
         };
@@ -498,12 +498,12 @@ export fn beaver_raw_context_attach_diagnostic_handler(env: beam.env, _: c_int,
         userData.?.handler = h;
     }
     const id = c.mlirContextAttachDiagnosticHandler(arg0, BeaverDiagnostic.errorHandler, userData, BeaverDiagnostic.deleteUserData);
-    return mlir_capi.MlirDiagnosticHandlerID.resource.make(env, id) catch return beam.make_error_binary(env, "when calling C function mlirContextAttachDiagnosticHandler, fail to make resource for: " ++ @typeName(mlir_capi.MlirDiagnosticHandlerID.T));
+    return mlir_capi.DiagnosticHandlerID.resource.make(env, id) catch return beam.make_error_binary(env, "when calling C function mlirContextAttachDiagnosticHandler, fail to make resource for: " ++ @typeName(mlir_capi.DiagnosticHandlerID.T));
 }
 
 fn beaver_raw_parse_pass_pipeline(env: beam.env, _: c_int, args: [*c]const beam.term) callconv(.C) beam.term {
-    var passManager: mlir_capi.MlirOpPassManager.T = mlir_capi.MlirOpPassManager.resource.fetch(env, args[0]) catch
-        return beam.make_error_binary(env, "when calling C function mlirParsePassPipeline, fail to fetch resource for passManager, expected: " ++ @typeName(mlir_capi.MlirOpPassManager.T));
+    var passManager: mlir_capi.OpPassManager.T = mlir_capi.OpPassManager.resource.fetch(env, args[0]) catch
+        return beam.make_error_binary(env, "when calling C function mlirParsePassPipeline, fail to fetch resource for passManager, expected: " ++ @typeName(mlir_capi.OpPassManager.T));
     var pipeline: mlir_capi.StringRef.T = mlir_capi.StringRef.resource.fetch(env, args[1]) catch
         return beam.make_error_binary(env, "when calling C function mlirParsePassPipeline, fail to fetch resource for pipeline, expected: " ++ @typeName(mlir_capi.StringRef.T));
     return mlir_capi.LogicalResult.resource.make(env, c.mlirOpPassManagerAddPipeline(passManager, pipeline, BeaverDiagnostic.printDiagnostic, null)) catch return beam.make_error_binary(env, "when calling C function mlirParsePassPipeline, fail to make resource for: " ++ @typeName(mlir_capi.LogicalResult.T));
@@ -748,7 +748,7 @@ const handwritten_nifs = @import("wrapper.zig").nif_entries ++ mlir_capi.Entries
     e.ErlNifFunc{ .name = "beaver_raw_beaver_type_print", .arity = 1, .fptr = Printer(mlir_capi.Type, c.mlirTypePrint).print, .flags = 0 },
     e.ErlNifFunc{ .name = "beaver_raw_beaver_operation_print", .arity = 1, .fptr = Printer(mlir_capi.Operation, c.mlirOperationPrint).print, .flags = 0 },
     e.ErlNifFunc{ .name = "beaver_raw_beaver_value_print", .arity = 1, .fptr = Printer(mlir_capi.Value, c.mlirValuePrint).print, .flags = 0 },
-    e.ErlNifFunc{ .name = "beaver_raw_beaver_pm_print", .arity = 1, .fptr = Printer(mlir_capi.MlirOpPassManager, c.mlirPrintPassPipeline).print, .flags = 0 },
+    e.ErlNifFunc{ .name = "beaver_raw_beaver_pm_print", .arity = 1, .fptr = Printer(mlir_capi.OpPassManager, c.mlirPrintPassPipeline).print, .flags = 0 },
     e.ErlNifFunc{ .name = "beaver_raw_beaver_affine_map_print", .arity = 1, .fptr = Printer(mlir_capi.AffineMap, c.mlirAffineMapPrint).print, .flags = 0 },
     e.ErlNifFunc{ .name = "beaver_raw_beaver_location_print", .arity = 1, .fptr = Printer(mlir_capi.Location, c.beaverLocationPrint).print, .flags = 0 },
     e.ErlNifFunc{ .name = "beaver_raw_get_resource_c_string", .arity = 1, .fptr = beaver_raw_get_resource_c_string, .flags = 0 },

native/mlir-zig-proj/src/mlir_capi.zig

@@ -60,34 +60,34 @@ fn MLIRCAPIKind(comptime n: []const u8) type {
     return kinda.ResourceKind(@field(c, n), root_module ++ "." ++ n);
 }
 
-pub const MlirShapedTypeComponentsCallback = MLIRCAPIKind("MlirShapedTypeComponentsCallback");
-pub const MlirTypeID = MLIRCAPIKind("MlirTypeID");
-pub const MlirTypesCallback = MLIRCAPIKind("MlirTypesCallback");
-pub const MlirIntegerSet = MLIRCAPIKind("MlirIntegerSet");
-pub const MlirAffineExpr = MLIRCAPIKind("MlirAffineExpr");
-pub const MlirStringCallback = MLIRCAPIKind("MlirStringCallback");
-pub const MlirDialectHandle = MLIRCAPIKind("MlirDialectHandle");
-pub const MlirDialectRegistry = MLIRCAPIKind("MlirDialectRegistry");
-pub const MlirDiagnosticHandlerID = MLIRCAPIKind("MlirDiagnosticHandlerID");
-pub const MlirDiagnosticHandler = MLIRCAPIKind("MlirDiagnosticHandler");
-pub const MlirDiagnostic = MLIRCAPIKind("MlirDiagnostic");
-pub const MlirDiagnosticSeverity = MLIRCAPIKind("MlirDiagnosticSeverity");
-pub const MlirPassManager = MLIRCAPIKind("MlirPassManager");
-pub const MlirRewritePatternSet = MLIRCAPIKind("MlirRewritePatternSet");
-pub const MlirExecutionEngine = MLIRCAPIKind("MlirExecutionEngine");
-pub const MlirOperationState = MLIRCAPIKind("MlirOperationState");
-pub const MlirSymbolTable = MLIRCAPIKind("MlirSymbolTable");
-pub const MlirRegisteredOperationName = MLIRCAPIKind("MlirRegisteredOperationName");
-pub const MlirExternalPass = MLIRCAPIKind("MlirExternalPass");
-pub const MlirExternalPassCallbacks = MLIRCAPIKind("MlirExternalPassCallbacks");
-pub const MlirOpPassManager = MLIRCAPIKind("MlirOpPassManager");
-pub const MlirAsmState = MLIRCAPIKind("MlirAsmState");
-pub const MlirOperationWalkCallback = MLIRCAPIKind("MlirOperationWalkCallback");
-pub const MlirWalkOrder = MLIRCAPIKind("MlirWalkOrder");
-pub const MlirBytecodeWriterConfig = MLIRCAPIKind("MlirBytecodeWriterConfig");
-pub const MlirOpPrintingFlags = MLIRCAPIKind("MlirOpPrintingFlags");
-pub const MlirLlvmThreadPool = MLIRCAPIKind("MlirLlvmThreadPool");
-pub const MlirTypeIDAllocator = MLIRCAPIKind("MlirTypeIDAllocator");
+pub const ShapedTypeComponentsCallback = MLIRCAPIKind("MlirShapedTypeComponentsCallback");
+pub const TypeID = MLIRCAPIKind("MlirTypeID");
+pub const TypesCallback = MLIRCAPIKind("MlirTypesCallback");
+pub const IntegerSet = MLIRCAPIKind("MlirIntegerSet");
+pub const AffineExpr = MLIRCAPIKind("MlirAffineExpr");
+pub const StringCallback = MLIRCAPIKind("MlirStringCallback");
+pub const DialectHandle = MLIRCAPIKind("MlirDialectHandle");
+pub const DialectRegistry = MLIRCAPIKind("MlirDialectRegistry");
+pub const DiagnosticHandlerID = MLIRCAPIKind("MlirDiagnosticHandlerID");
+pub const DiagnosticHandler = MLIRCAPIKind("MlirDiagnosticHandler");
+pub const Diagnostic = MLIRCAPIKind("MlirDiagnostic");
+pub const DiagnosticSeverity = MLIRCAPIKind("MlirDiagnosticSeverity");
+pub const PassManager = MLIRCAPIKind("MlirPassManager");
+pub const RewritePatternSet = MLIRCAPIKind("MlirRewritePatternSet");
+pub const ExecutionEngine = MLIRCAPIKind("MlirExecutionEngine");
+pub const OperationState = MLIRCAPIKind("MlirOperationState");
+pub const SymbolTable = MLIRCAPIKind("MlirSymbolTable");
+pub const RegisteredOperationName = MLIRCAPIKind("MlirRegisteredOperationName");
+pub const ExternalPass = MLIRCAPIKind("MlirExternalPass");
+pub const ExternalPassCallbacks = MLIRCAPIKind("MlirExternalPassCallbacks");
+pub const OpPassManager = MLIRCAPIKind("MlirOpPassManager");
+pub const AsmState = MLIRCAPIKind("MlirAsmState");
+pub const OperationWalkCallback = MLIRCAPIKind("MlirOperationWalkCallback");
+pub const WalkOrder = MLIRCAPIKind("MlirWalkOrder");
+pub const BytecodeWriterConfig = MLIRCAPIKind("MlirBytecodeWriterConfig");
+pub const OpPrintingFlags = MLIRCAPIKind("MlirOpPrintingFlags");
+pub const LlvmThreadPool = MLIRCAPIKind("MlirLlvmThreadPool");
+pub const TypeIDAllocator = MLIRCAPIKind("MlirTypeIDAllocator");
 
 pub const allKinds = .{
     Pass,
@@ -98,15 +98,15 @@ pub const allKinds = .{
     ISize,
     Attribute,
     OpaquePtr,
-    MlirShapedTypeComponentsCallback,
-    MlirTypeID,
-    MlirTypesCallback,
+    ShapedTypeComponentsCallback,
+    TypeID,
+    TypesCallback,
     Bool,
     Operation,
-    MlirIntegerSet,
-    MlirAffineExpr,
-    MlirStringCallback,
-    MlirDialectHandle,
+    IntegerSet,
+    AffineExpr,
+    StringCallback,
+    DialectHandle,
     CInt,
     AffineMap,
     Enum_MlirSparseTensorLevelType,
@@ -115,12 +115,12 @@ pub const allKinds = .{
     I32,
     I64,
     CUInt,
-    MlirDialectRegistry,
-    MlirDiagnosticHandlerID,
-    MlirDiagnosticHandler,
+    DialectRegistry,
+    DiagnosticHandlerID,
+    DiagnosticHandler,
     DiagnosticHandlerDeleteUserData,
-    MlirDiagnostic,
-    MlirDiagnosticSeverity,
+    Diagnostic,
+    DiagnosticSeverity,
     F32,
     U64,
     U32,
@@ -132,34 +132,34 @@ pub const allKinds = .{
     UnmanagedDenseResourceElementsAttrGetDeleteCallback,
     OpaqueArray,
     NamedAttribute,
-    MlirPassManager,
-    MlirRewritePatternSet,
+    PassManager,
+    RewritePatternSet,
     Region,
     Module,
-    MlirExecutionEngine,
+    ExecutionEngine,
     GenericCallback,
     ExternalPassConstruct,
     ExternalPassRun,
     Identifier,
-    MlirOperationState,
-    MlirSymbolTable,
+    OperationState,
+    SymbolTable,
     Value,
     Block,
     Dialect,
-    MlirRegisteredOperationName,
-    MlirExternalPass,
-    MlirExternalPassCallbacks,
-    MlirOpPassManager,
+    RegisteredOperationName,
+    ExternalPass,
+    ExternalPassCallbacks,
+    OpPassManager,
     AffineMapCompressUnusedSymbolsPopulateResult,
     SymbolTableWalkSymbolTablesCallback,
     OpOperand,
-    MlirAsmState,
-    MlirOperationWalkCallback,
-    MlirWalkOrder,
-    MlirBytecodeWriterConfig,
-    MlirOpPrintingFlags,
-    MlirLlvmThreadPool,
-    MlirTypeIDAllocator,
+    AsmState,
+    OperationWalkCallback,
+    WalkOrder,
+    BytecodeWriterConfig,
+    OpPrintingFlags,
+    LlvmThreadPool,
+    TypeIDAllocator,
 };
 pub fn open_generated_resource_types(env: beam.env) void {
     inline for (allKinds) |k| {