Skip to content

Mlir polish #8

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
ngmachado merged 4 commits into from
Oct 25, 2025
Merged

Mlir polish #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f35c182
Add loc to MLIR
ngmachado Oct 24, 2025
186ac01
fix a lot of pending tasks around MLIR
ngmachado Oct 25, 2025
05545d4
clean our cmd, removed legacy commands
ngmachado Oct 25, 2025
61f9e0b
start panic if errors
ngmachado Oct 25, 2025
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
257 changes: 54 additions & 203 deletions src/main.zig
View file
Open in desktop

Large diffs are not rendered by default.

326 changes: 181 additions & 145 deletions src/mlir/declarations.zig
View file
Open in desktop

Large diffs are not rendered by default.

157 changes: 78 additions & 79 deletions src/mlir/dialect.zig
View file
Open in desktop

Large diffs are not rendered by default.

776 changes: 471 additions & 305 deletions src/mlir/expressions.zig
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions src/mlir/helpers.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ const std = @import("std");
const c = @import("c.zig").c;
const lib = @import("ora_lib");

/// Create MLIR string reference from null-terminated string
/// Replaces the verbose: c.mlirStringRefCreateFromCString(str.ptr)
/// Create MLIR string reference from Zig slice
/// Replaces the verbose: c.mlirStringRefCreate(str.ptr, str.len)
pub inline fn strRef(str: []const u8) c.MlirStringRef {
return c.mlirStringRefCreateFromCString(str.ptr);
return c.mlirStringRefCreate(str.ptr, str.len);
}

/// Create MLIR string reference from string literal at comptime
Expand Down
10 changes: 8 additions & 2 deletions src/mlir/locations.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,21 @@ const h = @import("helpers.zig"); // Import helpers
/// Location tracking system for preserving source information in MLIR
pub const LocationTracker = struct {
ctx: c.MlirContext,
filename: []const u8,

pub fn init(ctx: c.MlirContext) LocationTracker {
return .{ .ctx = ctx };
return .{ .ctx = ctx, .filename = "input.ora" };
}

pub fn initWithFilename(ctx: c.MlirContext, filename: []const u8) LocationTracker {
return .{ .ctx = ctx, .filename = filename };
}

/// Create a location from SourceSpan information
pub fn createLocation(self: *const LocationTracker, span: ?lib.ast.SourceSpan) c.MlirLocation {
if (span) |s| {
return c.mlirLocationFileLineColGet(self.ctx, h.strRefLit("input.ora"), s.line, s.column);
const fname_ref = c.mlirStringRefCreate(self.filename.ptr, self.filename.len);
return c.mlirLocationFileLineColGet(self.ctx, fname_ref, s.line, s.column);
}
return h.unknownLoc(self.ctx);
}
Expand Down
80 changes: 63 additions & 17 deletions src/mlir/lower.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,10 +405,36 @@ pub fn convertSemanticSymbolTable(semantic_table: *const lib.semantics.state.Sym
_ = allocator;
}

/// Helper to get span from AstNode
fn getNodeSpan(node: *const lib.AstNode) ?lib.ast.SourceSpan {
return switch (node.*) {
.Contract => |contract| contract.span,
.Function => |func| func.span,
.VariableDecl => |var_decl| var_decl.span,
.StructDecl => |struct_decl| struct_decl.span,
.EnumDecl => |enum_decl| enum_decl.span,
.LogDecl => |log_decl| log_decl.span,
.Import => |import| import.span,
.ErrorDecl => |error_decl| error_decl.span,
else => null,
};
}

/// Main entry point for lowering Ora AST nodes to MLIR module with semantic analysis symbol table
/// This function uses the semantic analysis symbol table for type resolution
pub fn lowerFunctionsToModuleWithSemanticTable(ctx: c.MlirContext, nodes: []lib.AstNode, allocator: std.mem.Allocator, semantic_table: *const lib.semantics.state.SymbolTable) !LoweringResult {
const loc = c.mlirLocationUnknownGet(ctx);
pub fn lowerFunctionsToModuleWithSemanticTable(ctx: c.MlirContext, nodes: []lib.AstNode, allocator: std.mem.Allocator, semantic_table: *const lib.semantics.state.SymbolTable, source_filename: ?[]const u8) !LoweringResult {
// Create location tracker to get proper module location
const location_tracker = if (source_filename) |fname|
LocationTracker.initWithFilename(ctx, fname)
else
LocationTracker.init(ctx);

// Use first node's location if available, otherwise unknown (module wrapper has no single location)
const loc = if (nodes.len > 0)
location_tracker.createLocation(getNodeSpan(&nodes[0]))
else
location_tracker.getUnknownLocation();

const module = c.mlirModuleCreateEmpty(loc);
_ = c.mlirModuleGetBody(module);

Expand All @@ -422,7 +448,10 @@ pub fn lowerFunctionsToModuleWithSemanticTable(ctx: c.MlirContext, nodes: []lib.
std.debug.print("Warning: Failed to register Ora dialect\n", .{});
};

const locations = LocationTracker.init(ctx);
const locations = if (source_filename) |fname|
LocationTracker.initWithFilename(ctx, fname)
else
LocationTracker.init(ctx);

// Create global symbol table and storage map for the module
var symbol_table = SymbolTable.init(allocator);
Expand Down Expand Up @@ -500,8 +529,12 @@ pub fn lowerFunctionsToModuleWithSemanticTable(ctx: c.MlirContext, nodes: []lib.

/// Main entry point for lowering Ora AST nodes to MLIR module with comprehensive error handling
/// This function orchestrates the modular lowering components and provides robust error reporting
pub fn lowerFunctionsToModuleWithErrors(ctx: c.MlirContext, nodes: []lib.AstNode, allocator: std.mem.Allocator) !LoweringResult {
const loc = c.mlirLocationUnknownGet(ctx);
pub fn lowerFunctionsToModuleWithErrors(ctx: c.MlirContext, nodes: []lib.AstNode, allocator: std.mem.Allocator, source_filename: ?[]const u8) !LoweringResult {
const location_tracker = if (source_filename) |fname|
LocationTracker.initWithFilename(ctx, fname)
else
LocationTracker.init(ctx);
const loc = location_tracker.getUnknownLocation();
const module = c.mlirModuleCreateEmpty(loc);
const body = c.mlirModuleGetBody(module);

Expand All @@ -515,7 +548,10 @@ pub fn lowerFunctionsToModuleWithErrors(ctx: c.MlirContext, nodes: []lib.AstNode
std.debug.print("Warning: Failed to register Ora dialect\n", .{});
};

const locations = LocationTracker.init(ctx);
const locations = if (source_filename) |fname|
LocationTracker.initWithFilename(ctx, fname)
else
LocationTracker.init(ctx);

// Create global symbol table and storage map for the module
var symbol_table = SymbolTable.init(allocator);
Expand Down Expand Up @@ -553,8 +589,8 @@ pub fn lowerFunctionsToModuleWithErrors(ctx: c.MlirContext, nodes: []lib.AstNode
};

for (enum_decl.variants, 0..) |variant, i| {
// For now, use index as value since we don't have a way to evaluate the expression
// TODO: Evaluate the expression to get the actual value
// Use index as value for implicit enum variants
// Explicit value evaluation handled by constant expression evaluator
variants_slice[i] = .{
.name = variant.name,
.value = null, // Will be set to index during symbol table creation
Expand Down Expand Up @@ -604,13 +640,23 @@ pub fn lowerFunctionsToModuleWithErrors(ctx: c.MlirContext, nodes: []lib.AstNode
continue;
};

// Calculate field offsets based on cumulative sizes
var current_offset: usize = 0;
for (struct_decl.fields, 0..) |field, i| {
const field_type = decl_lowerer.type_mapper.toMlirType(field.type_info);

// Calculate offset: for EVM, each field occupies a storage slot
// In memory/stack, we use byte offsets based on type width
// For simplicity, use slot-based offsets (32 bytes per field in EVM)
fields_slice[i] = .{
.name = field.name,
.field_type = field_type,
.offset = null, // TODO: Calculate field offsets
.offset = current_offset,
};

// Increment offset: in EVM storage, each slot is 32 bytes
// For proper layout, this should consider actual type sizes
current_offset += 32; // EVM storage slot size in bytes
}

// Check if type already exists before allocating
Expand Down Expand Up @@ -930,7 +976,7 @@ pub fn lowerFunctionsToModuleWithErrors(ctx: c.MlirContext, nodes: []lib.AstNode
// Handle expressions within module with graceful degradation
try error_handler.reportGracefulDegradation("expressions within modules", "expression capture operations", error_handling.getSpanFromExpression(expr));
// Create a placeholder operation to allow compilation to continue
const expr_lowerer = ExpressionLowerer.init(ctx, body, &type_mapper, null, null, null, locations, &ora_dialect);
const expr_lowerer = ExpressionLowerer.init(ctx, body, &type_mapper, null, null, null, &symbol_table, locations, &ora_dialect);
const expr_value = expr_lowerer.lowerExpression(expr);
const expr_op = expr_lowerer.createExpressionCapture(expr_value, error_handling.getSpanFromExpression(expr));
if (error_handler.validateMlirOperation(expr_op, error_handling.getSpanFromExpression(expr)) catch false) {
Expand All @@ -941,7 +987,7 @@ pub fn lowerFunctionsToModuleWithErrors(ctx: c.MlirContext, nodes: []lib.AstNode
// Handle statements within modules with graceful degradation
try error_handler.reportGracefulDegradation("statements within modules", "statement lowering operations", error_handling.getSpanFromStatement(stmt));
// Create a placeholder operation to allow compilation to continue
const expr_lowerer = ExpressionLowerer.init(ctx, body, &type_mapper, null, null, null, locations, &ora_dialect);
const expr_lowerer = ExpressionLowerer.init(ctx, body, &type_mapper, null, null, null, &symbol_table, locations, &ora_dialect);
const stmt_lowerer = StatementLowerer.init(ctx, body, &type_mapper, &expr_lowerer, null, null, null, locations, &symbol_table, std.heap.page_allocator, null, &ora_dialect);
stmt_lowerer.lowerStatement(stmt) catch {
try error_handler.reportError(.MlirOperationFailed, error_handling.getSpanFromStatement(stmt), "failed to lower top-level statement", "check statement structure and dependencies");
Expand Down Expand Up @@ -992,7 +1038,7 @@ pub fn lowerFunctionsToModuleWithErrors(ctx: c.MlirContext, nodes: []lib.AstNode
}

// Create a temporary expression lowerer for top-level expressions
const expr_lowerer = ExpressionLowerer.init(ctx, body, &type_mapper, null, null, null, locations, &ora_dialect);
const expr_lowerer = ExpressionLowerer.init(ctx, body, &type_mapper, null, null, null, &symbol_table, locations, &ora_dialect);
const expr_value = expr_lowerer.lowerExpression(expr);

// For top-level expressions, we need to create a proper operation
Expand All @@ -1018,7 +1064,7 @@ pub fn lowerFunctionsToModuleWithErrors(ctx: c.MlirContext, nodes: []lib.AstNode
}

// Create a temporary statement lowerer for top-level statements
const expr_lowerer = ExpressionLowerer.init(ctx, body, &type_mapper, null, null, null, locations, &ora_dialect);
const expr_lowerer = ExpressionLowerer.init(ctx, body, &type_mapper, null, null, null, &symbol_table, locations, &ora_dialect);
const stmt_lowerer = StatementLowerer.init(ctx, body, &type_mapper, &expr_lowerer, null, null, null, locations, null, std.heap.page_allocator, null, &ora_dialect);
stmt_lowerer.lowerStatement(stmt) catch {
try error_handler.reportError(.MlirOperationFailed, error_handling.getSpanFromStatement(stmt), "failed to lower top-level statement", "check statement structure and dependencies");
Expand Down Expand Up @@ -1081,9 +1127,9 @@ pub fn lowerFunctionsToModuleWithErrors(ctx: c.MlirContext, nodes: []lib.AstNode
}

/// Main entry point with pass management support
pub fn lowerFunctionsToModuleWithPasses(ctx: c.MlirContext, nodes: []lib.AstNode, allocator: std.mem.Allocator, pass_config: ?PassPipelineConfig) !LoweringResult {
pub fn lowerFunctionsToModuleWithPasses(ctx: c.MlirContext, nodes: []lib.AstNode, allocator: std.mem.Allocator, pass_config: ?PassPipelineConfig, source_filename: ?[]const u8) !LoweringResult {
// First, perform the basic lowering
var lowering_result = try lowerFunctionsToModuleWithErrors(ctx, nodes, allocator);
var lowering_result = try lowerFunctionsToModuleWithErrors(ctx, nodes, allocator, source_filename);

// If lowering failed, return early
if (!lowering_result.success) {
Expand Down Expand Up @@ -1224,9 +1270,9 @@ pub fn lowerFunctionsToModuleRelease(ctx: c.MlirContext, nodes: []lib.AstNode, a
}

/// Convenience function with custom pass pipeline string
pub fn lowerFunctionsToModuleWithPipelineString(ctx: c.MlirContext, nodes: []lib.AstNode, allocator: std.mem.Allocator, pipeline_str: []const u8) !LoweringResult {
pub fn lowerFunctionsToModuleWithPipelineString(ctx: c.MlirContext, nodes: []lib.AstNode, allocator: std.mem.Allocator, pipeline_str: []const u8, source_filename: ?[]const u8) !LoweringResult {
// First, perform the basic lowering
var lowering_result = try lowerFunctionsToModuleWithErrors(ctx, nodes, allocator);
var lowering_result = try lowerFunctionsToModuleWithErrors(ctx, nodes, allocator, source_filename);

// If lowering failed, return early
if (!lowering_result.success) {
Expand Down
Loading
Loading