Pass pointer to MLIR-to-XLS translation for returning the xls::Package after translation.

PiperOrigin-RevId: 893697815

Author: XLS Team

xls/contrib/mlir/tools/xls_translate/xls_translate_from_mlir.cc

@@ -1741,7 +1741,8 @@ FailureOr<std::unique_ptr<Package>> mlirXlsToXls(Operation* op,
 LogicalResult MlirXlsToXlsTranslate(
     Operation* op, llvm::raw_ostream& output,
     MlirXlsToXlsTranslateOptions options, MetricsReporter metrics_reporter,
-    SchedulingMetricsReporter scheduling_metrics_reporter) {
+    SchedulingMetricsReporter scheduling_metrics_reporter,
+    std::unique_ptr<Package>* xls_package) {
   // It is important to ensure the XlsDialect is loaded, because it registers
   // the XlsRegionOpInterface external model for FuncOp.
   op->getContext()->getOrLoadDialect<XlsDialect>();
@@ -1784,6 +1785,9 @@ LogicalResult MlirXlsToXlsTranslate(
   if (!options.generate_verilog) {
     std::string out = (*package)->DumpIr();
     output << out;
+    if (xls_package != nullptr) {
+      *xls_package = std::move(*package);
+    }
     return success();
   }
 
@@ -1813,6 +1817,9 @@ LogicalResult MlirXlsToXlsTranslate(
   }
 
   output << xls_codegen_results->codegen_result.verilog_text;
+  if (xls_package != nullptr) {
+    *xls_package = std::move(*package);
+  }
   return success();
 }
 

xls/contrib/mlir/tools/xls_translate/xls_translate_from_mlir.h

@@ -115,7 +115,8 @@ LogicalResult MlirXlsToXlsTranslate(
     Operation* op, llvm::raw_ostream& output,
     MlirXlsToXlsTranslateOptions options = {},
     MetricsReporter metrics_reporter = nullptr,
-    SchedulingMetricsReporter scheduling_metrics_reporter = nullptr);
+    SchedulingMetricsReporter scheduling_metrics_reporter = nullptr,
+    std::unique_ptr<::xls::Package>* xls_package = nullptr);
 
 // Translates an operation with XLS dialect to XLS IR.
 FailureOr<std::unique_ptr<::xls::Package>> mlirXlsToXls(

xls/estimators/area_model/BUILD

@@ -33,6 +33,7 @@ cc_library(
     name = "area_estimator",
     srcs = ["area_estimator.cc"],
     hdrs = ["area_estimator.h"],
+    visibility = ["//xls:xls_users"],
     deps = [
         "//xls/common/status:status_macros",
         "//xls/ir",
@@ -68,6 +69,7 @@ cc_library(
     name = "area_estimators",
     srcs = ["area_estimators.cc"],
     hdrs = ["area_estimators.h"],
+    visibility = ["//xls:xls_users"],
     deps = [
         ":area_estimator",
         "//xls/ir",