Merge pull request #1268 from WoutLegiest:hl-emit-fpga

PiperOrigin-RevId: 715876270
google · Jan 15, 2025 · 79febe7 · 79febe7
2 parents c306a1a + e76bae0
commit 79febe7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 36 deletions.
diff --git a/lib/Target/TfheRustHL/TfheRustHLEmitter.cpp b/lib/Target/TfheRustHL/TfheRustHLEmitter.cpp
@@ -74,20 +74,7 @@ void registerToTfheRustHLTranslation() {
   TranslateFromMLIRRegistration reg(
       "emit-tfhe-rust-hl", "translate the tfhe-rs dialect to HL Rust code",
       [](Operation *op, llvm::raw_ostream &output) {
-        return translateToTfheRustHL(op, output, /*belfortAPI=*/false);
-      },
-      [](DialectRegistry &registry) {
-        registry.insert<func::FuncDialect, tfhe_rust::TfheRustDialect,
-                        affine::AffineDialect, arith::ArithDialect,
-                        tensor::TensorDialect, memref::MemRefDialect>();
-      });
-
-  TranslateFromMLIRRegistration regFPGA(
-      "emit-tfhe-rust-hl-fpga",
-      "translate the tfhe-rs-bool dialect to Rust code for Belfort FPGA "
-      "HL tfhe-rs API",
-      [](Operation *op, llvm::raw_ostream &output) {
-        return translateToTfheRustHL(op, output, /*belfortAPI=*/true);
+        return translateToTfheRustHL(op, output);
       },
       [](DialectRegistry &registry) {
         registry.insert<func::FuncDialect, tfhe_rust::TfheRustDialect,
@@ -96,10 +83,9 @@ void registerToTfheRustHLTranslation() {
       });
 }
 
-LogicalResult translateToTfheRustHL(Operation *op, llvm::raw_ostream &os,
-                                    bool belfortAPI) {
+LogicalResult translateToTfheRustHL(Operation *op, llvm::raw_ostream &os) {
   SelectVariableNames variableNames(op);
-  TfheRustHLEmitter emitter(os, &variableNames, belfortAPI);
+  TfheRustHLEmitter emitter(os, &variableNames);
   LogicalResult result = emitter.translate(*op);
   return result;
 }
@@ -141,7 +127,7 @@ LogicalResult TfheRustHLEmitter::translate(Operation &op) {
 }
 
 LogicalResult TfheRustHLEmitter::printOperation(ModuleOp moduleOp) {
-  os << (belfortAPI ? kFPGAModulePrelude : kModulePrelude) << "\n";
+  os << kModulePrelude << "\n";
 
   // Find default type of the module and use a Type alias
   moduleOp.getOperation()->walk([&](Operation *op) {
@@ -657,9 +643,8 @@ std::string TfheRustHLEmitter::checkOrigin(Value value) {
 }
 
 TfheRustHLEmitter::TfheRustHLEmitter(raw_ostream &os,
-                                     SelectVariableNames *variableNames,
-                                     bool belfortAPI)
-    : os(os), variableNames(variableNames), belfortAPI(belfortAPI) {}
+                                     SelectVariableNames *variableNames)
+    : os(os), variableNames(variableNames) {}
 }  // namespace tfhe_rust
 }  // namespace heir
 }  // namespace mlir
diff --git a/lib/Target/TfheRustHL/TfheRustHLEmitter.h b/lib/Target/TfheRustHL/TfheRustHLEmitter.h
@@ -30,13 +30,11 @@ void registerToTfheRustHLTranslation();
 
 /// Translates the given operation to TfheRustHL.
 ::mlir::LogicalResult translateToTfheRustHL(::mlir::Operation *op,
-                                            llvm::raw_ostream &os,
-                                            bool belfortAPI);
+                                            llvm::raw_ostream &os);
 
 class TfheRustHLEmitter {
  public:
-  TfheRustHLEmitter(raw_ostream &os, SelectVariableNames *variableNames,
-                    bool belfortAPI);
+  TfheRustHLEmitter(raw_ostream &os, SelectVariableNames *variableNames);
 
   LogicalResult translate(::mlir::Operation &operation);
   bool containsVectorOperands(Operation *op);
@@ -49,9 +47,6 @@ class TfheRustHLEmitter {
   /// values.
   SelectVariableNames *variableNames;
 
-  // Boolean to keep track if the Belfort API is used or not
-  bool belfortAPI;
-
   // Functions for printing individual ops
   LogicalResult printOperation(::mlir::ModuleOp op);
   LogicalResult printOperation(::mlir::func::FuncOp op);

diff --git a/lib/Target/TfheRustHL/TfheRustHLTemplates.h b/lib/Target/TfheRustHL/TfheRustHLTemplates.h
@@ -14,14 +14,6 @@ use tfhe::prelude::*;
 use tfhe::ServerKey;
 )rust";
 
-constexpr std::string_view kFPGAModulePrelude = R"rust(
-use std::collections::BTreeMap;
-use tfhe::boolean::{engine::fpga::{BelfortBooleanServerKey, Gate}, prelude::*};
-
-use crate::server_key_enum::ServerKeyEnum;
-use crate::server_key_enum::ServerKeyTrait;
-)rust";
-
 }  // namespace tfhe_rust
 }  // namespace heir
 }  // namespace mlir