Rename StreamingJitBlockEvaluator to JitBlockEvaluator

The other one was only for testing and is removed now. PiperOrigin-RevId: 649230462
google · Jul 3, 2024 · 30f7e73 · 30f7e73
1 parent 5118f14
commit 30f7e73
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 10 deletions.
diff --git a/xls/codegen/block_execution_fuzz_test.cc b/xls/codegen/block_execution_fuzz_test.cc
@@ -294,7 +294,7 @@ class CustomScheduleFuzzer
     if (kInterpreter) {
       return kInterpreterBlockEvaluator.NewContinuation(b, resets).value();
     }
-    return kStreamingJitBlockEvaluator.NewContinuation(b, resets).value();
+    return kJitBlockEvaluator.NewContinuation(b, resets).value();
   }
 };
 

diff --git a/xls/jit/block_jit.cc b/xls/jit/block_jit.cc
@@ -546,7 +546,7 @@ class BlockContinuationJitWrapper final : public BlockContinuation {
 }  // namespace
 
 absl::StatusOr<std::unique_ptr<BlockContinuation>>
-StreamingJitBlockEvaluator::MakeNewContinuation(
+JitBlockEvaluator::MakeNewContinuation(
     BlockElaboration&& elaboration,
     const absl::flat_hash_map<std::string, Value>& initial_registers) const {
   XLS_ASSIGN_OR_RETURN(auto jit, BlockJit::Create(elaboration));

diff --git a/xls/jit/block_jit.h b/xls/jit/block_jit.h
@@ -263,12 +263,9 @@ class BlockJitContinuation {
 
 // A jit block evaluator that tries to use the jit's register saving as
 // possible.
-class StreamingJitBlockEvaluator : public BlockEvaluator {
+class JitBlockEvaluator : public BlockEvaluator {
  public:
-  constexpr StreamingJitBlockEvaluator() : BlockEvaluator("StreamingJit") {}
-
-  // Expose the overload without `initial_registers`.
-  using BlockEvaluator::NewContinuation;
+  constexpr JitBlockEvaluator() : BlockEvaluator("Jit") {}
 
  protected:
   absl::StatusOr<std::unique_ptr<BlockContinuation>> MakeNewContinuation(
@@ -277,7 +274,7 @@ class StreamingJitBlockEvaluator : public BlockEvaluator {
       const override;
 };
 
-static const StreamingJitBlockEvaluator kStreamingJitBlockEvaluator;
+static const JitBlockEvaluator kJitBlockEvaluator;
 
 }  // namespace xls
 

diff --git a/xls/jit/block_jit_test.cc b/xls/jit/block_jit_test.cc
@@ -198,7 +198,7 @@ TEST_F(BlockJitTest, ExternInstantiationIsAnError) {
 
 INSTANTIATE_TEST_SUITE_P(JitBlockCommonTest, BlockEvaluatorTest,
                          testing::Values(BlockEvaluatorTestParam{
-                             .evaluator = &kStreamingJitBlockEvaluator,
+                             .evaluator = &kJitBlockEvaluator,
                              .supports_fifos = false,
                          }),
                          [](const auto& v) {

diff --git a/xls/tools/eval_proc_main.cc b/xls/tools/eval_proc_main.cc
@@ -750,7 +750,7 @@ static absl::Status RunBlock(
 
   const BlockEvaluator& continuation_factory =
       options.use_jit
-          ? reinterpret_cast<const BlockEvaluator&>(kStreamingJitBlockEvaluator)
+          ? reinterpret_cast<const BlockEvaluator&>(kJitBlockEvaluator)
           : reinterpret_cast<const BlockEvaluator&>(kInterpreterBlockEvaluator);
 
   XLS_ASSIGN_OR_RETURN(auto continuation,