Merge pull request #3432 from xlsynth:meheff/2025-11-26-outstanding-vast-changes

PiperOrigin-RevId: 838961509

Author: copybara-github

xls/public/c_api_symbols.txt

@@ -332,6 +332,7 @@ xls_vast_data_type_width
 xls_vast_data_type_width_as_int64
 xls_vast_def_get_data_type
 xls_vast_def_get_name
+xls_vast_expression_emit
 xls_vast_generate_loop_add_always_comb
 xls_vast_generate_loop_add_always_ff
 xls_vast_generate_loop_add_blank_line
@@ -354,9 +355,12 @@ xls_vast_logic_ref_get_name
 xls_vast_make_verilog_file
 xls_vast_parameter_ref_as_expression
 xls_vast_slice_as_expression
+xls_vast_statement_block_add_blank_line
 xls_vast_statement_block_add_blocking_assignment
 xls_vast_statement_block_add_case
+xls_vast_statement_block_add_comment_text
 xls_vast_statement_block_add_conditional
+xls_vast_statement_block_add_inline_text
 xls_vast_statement_block_add_nonblocking_assignment
 xls_vast_verilog_file_add_include
 xls_vast_verilog_file_add_module
@@ -365,6 +369,7 @@ xls_vast_verilog_file_free
 xls_vast_verilog_file_make_binary
 xls_vast_verilog_file_make_bit_vector_type
 xls_vast_verilog_file_make_bit_vector_type_with_expression
+xls_vast_verilog_file_make_blank_line
 xls_vast_verilog_file_make_blocking_assignment
 xls_vast_verilog_file_make_comment
 xls_vast_verilog_file_make_concat
@@ -384,6 +389,8 @@ xls_vast_verilog_file_make_nonblocking_assignment
 xls_vast_verilog_file_make_packed_array_type
 xls_vast_verilog_file_make_plain_literal
 xls_vast_verilog_file_make_pos_edge
+xls_vast_verilog_file_make_replicated_concat
+xls_vast_verilog_file_make_replicated_concat_i64
 xls_vast_verilog_file_make_scalar_type
 xls_vast_verilog_file_make_slice
 xls_vast_verilog_file_make_slice_i64
@@ -405,8 +412,10 @@ xls_vast_verilog_module_add_localparam_with_def
 xls_vast_verilog_module_add_logic
 xls_vast_verilog_module_add_logic_input
 xls_vast_verilog_module_add_logic_output
+xls_vast_verilog_module_add_member_blank_line
 xls_vast_verilog_module_add_member_comment
 xls_vast_verilog_module_add_member_continuous_assignment
+xls_vast_verilog_module_add_member_inline_statement
 xls_vast_verilog_module_add_member_instantiation
 xls_vast_verilog_module_add_output
 xls_vast_verilog_module_add_parameter

xls/public/c_api_vast.cc

@@ -289,6 +289,13 @@ char* xls_vast_verilog_file_emit(const struct xls_vast_verilog_file* f) {
   return xls::ToOwnedCString(result);
 }
 
+char* xls_vast_expression_emit(struct xls_vast_expression* expr) {
+  CHECK_NE(expr, nullptr);
+  auto* cpp_expr = reinterpret_cast<xls::verilog::Expression*>(expr);
+  std::string result = cpp_expr->Emit(/*line_info=*/nullptr);
+  return xls::ToOwnedCString(result);
+}
+
 struct xls_vast_data_type* xls_vast_verilog_file_make_scalar_type(
     struct xls_vast_verilog_file* f) {
   auto* cpp_file = reinterpret_cast<xls::verilog::VerilogFile*>(f);
@@ -408,6 +415,20 @@ void xls_vast_verilog_module_add_member_comment(
   auto* cpp_comment = reinterpret_cast<xls::verilog::Comment*>(comment);
   cpp_module->AddModuleMember(cpp_comment);
 }
+void xls_vast_verilog_module_add_member_blank_line(
+    struct xls_vast_verilog_module* m, struct xls_vast_blank_line* blank) {
+  auto* cpp_module = reinterpret_cast<xls::verilog::Module*>(m);
+  auto* cpp_blank = reinterpret_cast<xls::verilog::BlankLine*>(blank);
+  cpp_module->AddModuleMember(cpp_blank);
+}
+void xls_vast_verilog_module_add_member_inline_statement(
+    struct xls_vast_verilog_module* m,
+    struct xls_vast_inline_verilog_statement* stmt) {
+  auto* cpp_module = reinterpret_cast<xls::verilog::Module*>(m);
+  auto* cpp_stmt =
+      reinterpret_cast<xls::verilog::InlineVerilogStatement*>(stmt);
+  cpp_module->AddModuleMember(cpp_stmt);
+}
 
 struct xls_vast_literal* xls_vast_verilog_file_make_plain_literal(
     struct xls_vast_verilog_file* f, int32_t value) {
@@ -478,13 +499,20 @@ struct xls_vast_comment* xls_vast_verilog_file_make_comment(
       cpp_file->Make<xls::verilog::Comment>(xls::SourceInfo(), text);
   return reinterpret_cast<xls_vast_comment*>(cpp_comment);
 }
-
+struct xls_vast_blank_line* xls_vast_verilog_file_make_blank_line(
+    struct xls_vast_verilog_file* f) {
+  auto* cpp_file = reinterpret_cast<xls::verilog::VerilogFile*>(f);
+  xls::verilog::BlankLine* cpp_blank =
+      cpp_file->Make<xls::verilog::BlankLine>(xls::SourceInfo());
+  return reinterpret_cast<xls_vast_blank_line*>(cpp_blank);
+}
 struct xls_vast_inline_verilog_statement*
 xls_vast_verilog_file_make_inline_verilog_statement(
     struct xls_vast_verilog_file* f, const char* text) {
   auto* cpp_file = reinterpret_cast<xls::verilog::VerilogFile*>(f);
-  auto* cpp_stmt = cpp_file->Make<xls::verilog::InlineVerilogStatement>(
-      xls::SourceInfo(), text);
+  xls::verilog::InlineVerilogStatement* cpp_stmt =
+      cpp_file->Make<xls::verilog::InlineVerilogStatement>(xls::SourceInfo(),
+                                                           text);
   return reinterpret_cast<xls_vast_inline_verilog_statement*>(cpp_stmt);
 }
 
@@ -843,6 +871,39 @@ struct xls_vast_concat* xls_vast_verilog_file_make_concat(
   return reinterpret_cast<xls_vast_concat*>(cpp_concat);
 }
 
+struct xls_vast_concat* xls_vast_verilog_file_make_replicated_concat(
+    struct xls_vast_verilog_file* f, struct xls_vast_expression* replication,
+    struct xls_vast_expression** elements, size_t element_count) {
+  auto* cpp_file = reinterpret_cast<xls::verilog::VerilogFile*>(f);
+  auto* cpp_rep = reinterpret_cast<xls::verilog::Expression*>(replication);
+  std::vector<xls::verilog::Expression*> cpp_elements;
+  cpp_elements.reserve(element_count);
+  for (size_t i = 0; i < element_count; ++i) {
+    cpp_elements.push_back(
+        reinterpret_cast<xls::verilog::Expression*>(elements[i]));
+  }
+  xls::verilog::Concat* cpp_concat = cpp_file->Make<xls::verilog::Concat>(
+      xls::SourceInfo(), cpp_rep, absl::MakeConstSpan(cpp_elements));
+  return reinterpret_cast<xls_vast_concat*>(cpp_concat);
+}
+
+struct xls_vast_concat* xls_vast_verilog_file_make_replicated_concat_i64(
+    struct xls_vast_verilog_file* f, int64_t replication_count,
+    struct xls_vast_expression** elements, size_t element_count) {
+  auto* cpp_file = reinterpret_cast<xls::verilog::VerilogFile*>(f);
+  xls::verilog::Expression* cpp_rep =
+      cpp_file->PlainLiteral(replication_count, xls::SourceInfo());
+  std::vector<xls::verilog::Expression*> cpp_elements;
+  cpp_elements.reserve(element_count);
+  for (size_t i = 0; i < element_count; ++i) {
+    cpp_elements.push_back(
+        reinterpret_cast<xls::verilog::Expression*>(elements[i]));
+  }
+  xls::verilog::Concat* cpp_concat = cpp_file->Make<xls::verilog::Concat>(
+      xls::SourceInfo(), cpp_rep, absl::MakeConstSpan(cpp_elements));
+  return reinterpret_cast<xls_vast_concat*>(cpp_concat);
+}
+
 struct xls_vast_index* xls_vast_verilog_file_make_index_i64(
     struct xls_vast_verilog_file* f,
     struct xls_vast_indexable_expression* subject, int64_t index) {
@@ -1072,6 +1133,28 @@ struct xls_vast_statement* xls_vast_statement_block_add_nonblocking_assignment(
                                                           cpp_lhs, cpp_rhs);
   return reinterpret_cast<xls_vast_statement*>(cpp_assignment);
 }
+struct xls_vast_statement* xls_vast_statement_block_add_comment_text(
+    struct xls_vast_statement_block* block, const char* text) {
+  auto* cpp_block = reinterpret_cast<xls::verilog::StatementBlock*>(block);
+  xls::verilog::Comment* cpp_comment =
+      cpp_block->Add<xls::verilog::Comment>(xls::SourceInfo(), text);
+  return reinterpret_cast<xls_vast_statement*>(cpp_comment);
+}
+struct xls_vast_statement* xls_vast_statement_block_add_blank_line(
+    struct xls_vast_statement_block* block) {
+  auto* cpp_block = reinterpret_cast<xls::verilog::StatementBlock*>(block);
+  xls::verilog::BlankLine* cpp_blank =
+      cpp_block->Add<xls::verilog::BlankLine>(xls::SourceInfo());
+  return reinterpret_cast<xls_vast_statement*>(cpp_blank);
+}
+struct xls_vast_statement* xls_vast_statement_block_add_inline_text(
+    struct xls_vast_statement_block* block, const char* text) {
+  auto* cpp_block = reinterpret_cast<xls::verilog::StatementBlock*>(block);
+  xls::verilog::InlineVerilogStatement* cpp_stmt =
+      cpp_block->Add<xls::verilog::InlineVerilogStatement>(xls::SourceInfo(),
+                                                           text);
+  return reinterpret_cast<xls_vast_statement*>(cpp_stmt);
+}
 
 struct xls_vast_statement* xls_vast_statement_block_add_blocking_assignment(
     struct xls_vast_statement_block* block, struct xls_vast_expression* lhs,

xls/public/c_api_vast.h

@@ -57,6 +57,9 @@ struct xls_vast_parameter_ref;
 struct xls_vast_conditional;
 struct xls_vast_case_statement;
 struct xls_vast_localparam_ref;
+struct xls_vast_blank_line;
+struct xls_vast_inline_verilog_statement;
+
 // Note: We define the enum with a fixed width integer type for clarity of the
 // exposed ABI.
 typedef int32_t xls_vast_file_type;
@@ -154,6 +157,11 @@ void xls_vast_verilog_module_add_member_continuous_assignment(
     struct xls_vast_continuous_assignment* member);
 void xls_vast_verilog_module_add_member_comment(
     struct xls_vast_verilog_module* m, struct xls_vast_comment* comment);
+void xls_vast_verilog_module_add_member_blank_line(
+    struct xls_vast_verilog_module* m, struct xls_vast_blank_line* blank);
+void xls_vast_verilog_module_add_member_inline_statement(
+    struct xls_vast_verilog_module* m,
+    struct xls_vast_inline_verilog_statement* stmt);
 
 struct xls_vast_logic_ref* xls_vast_verilog_module_add_input(
     struct xls_vast_verilog_module* m, const char* name,
@@ -197,7 +205,6 @@ struct xls_vast_localparam_ref* xls_vast_verilog_module_add_localparam(
 
 // Note: returned value is owned by the caller, free via `xls_c_str_free`.
 char* xls_vast_verilog_module_get_name(struct xls_vast_verilog_module* m);
-
 // Returns the ports that are present on the given module.
 //
 // Note: the returned array is owned by the caller, to be freed by
@@ -277,6 +284,9 @@ xls_vast_verilog_file_make_continuous_assignment(
 struct xls_vast_comment* xls_vast_verilog_file_make_comment(
     struct xls_vast_verilog_file* f, const char* text);
 
+struct xls_vast_blank_line* xls_vast_verilog_file_make_blank_line(
+    struct xls_vast_verilog_file* f);
+
 struct xls_vast_inline_verilog_statement*
 xls_vast_verilog_file_make_inline_verilog_statement(
     struct xls_vast_verilog_file* f, const char* text);
@@ -296,6 +306,17 @@ struct xls_vast_concat* xls_vast_verilog_file_make_concat(
     struct xls_vast_verilog_file* f, struct xls_vast_expression** elements,
     size_t element_count);
 
+// Creates a replicated concatenation expression: {replication{elements...}}.
+// For single-element replication, pass element_count=1.
+struct xls_vast_concat* xls_vast_verilog_file_make_replicated_concat(
+    struct xls_vast_verilog_file* f, struct xls_vast_expression* replication,
+    struct xls_vast_expression** elements, size_t element_count);
+
+// Convenience: replicated concatenation with an integer replication count.
+struct xls_vast_concat* xls_vast_verilog_file_make_replicated_concat_i64(
+    struct xls_vast_verilog_file* f, int64_t replication_count,
+    struct xls_vast_expression** elements, size_t element_count);
+
 struct xls_vast_slice* xls_vast_verilog_file_make_slice_i64(
     struct xls_vast_verilog_file* f,
     struct xls_vast_indexable_expression* subject, int64_t hi, int64_t lo);
@@ -456,17 +477,24 @@ struct xls_vast_statement* xls_vast_statement_block_add_blocking_assignment(
     struct xls_vast_statement_block* block, struct xls_vast_expression* lhs,
     struct xls_vast_expression* rhs);
 
-// Adds a blocking assignment statement (lhs = rhs) to a statement block and
-// returns a pointer to the created statement.
-struct xls_vast_statement* xls_vast_statement_block_add_blocking_assignment(
-    struct xls_vast_statement_block* block, struct xls_vast_expression* lhs,
-    struct xls_vast_expression* rhs);
+struct xls_vast_statement* xls_vast_statement_block_add_comment_text(
+    struct xls_vast_statement_block* block, const char* text);
+
+struct xls_vast_statement* xls_vast_statement_block_add_blank_line(
+    struct xls_vast_statement_block* block);
+
+struct xls_vast_statement* xls_vast_statement_block_add_inline_text(
+    struct xls_vast_statement_block* block, const char* text);
 
 // Emits/formats the contents of the given verilog file to a string.
 //
 // Note: caller owns the returned string, to be freed by `xls_c_str_free`.
 char* xls_vast_verilog_file_emit(const struct xls_vast_verilog_file* f);
 
+// Emits an expression to a string and returns an owned C string; caller must
+// free with xls_c_str_free.
+char* xls_vast_expression_emit(struct xls_vast_expression* expr);
+
 // Adds an always_ff block to the module.
 // 'sensitivity_list_elements' is an array of expressions, typically created
 // using 'xls_vast_verilog_file_make_pos_edge' or