diff --git a/pipeline/benches/executor_benchmark.rs b/pipeline/benches/executor_benchmark.rs
index 89ee616f4..b0235e3cd 100644
--- a/pipeline/benches/executor_benchmark.rs
+++ b/pipeline/benches/executor_benchmark.rs
@@ -125,6 +125,32 @@ fn evaluator_benchmark(c: &mut Criterion) {
         })
     });
 
+    let sqrt_analyzed: Analyzed<GoldilocksField> = {
+        // airgen needs a main machine.
+        let code = "
+            let sqrt: int -> int = |x| sqrt_rec(x, x);
+            let sqrt_rec: int, int -> int = |y, x|
+                if y * y <= x && (y + 1) * (y + 1) > x {
+                    y
+                } else {
+                    sqrt_rec((y + x / y) / 2, x)
+                };
+            machine Main { }
+        "
+        .to_string();
+        let mut pipeline = Pipeline::default().from_asm_string(code, None);
+        pipeline.compute_analyzed_pil().unwrap().clone()
+    };
+
+    for x in [879882356, 1882356, 1187956, 56] {
+        group.bench_with_input(format!("sqrt_{x}"), &x, |b, &x| {
+            b.iter(|| {
+                let y = num_bigint::BigInt::from(x) * num_bigint::BigInt::from(112655675);
+                evaluate_integer_function(&sqrt_analyzed, "sqrt", vec![y.clone()]);
+            });
+        });
+    }
+
     group.finish();
 }
 
diff --git a/test_data/asm/sqrt.asm b/test_data/asm/sqrt.asm
index 0a856cd77..0a8fd672d 100644
--- a/test_data/asm/sqrt.asm
+++ b/test_data/asm/sqrt.asm
@@ -10,11 +10,18 @@ machine Sqrt(latch, operation_id) {
 
     // Witness generation is not smart enough to figure out that
     // there is a unique witness, so we provide it as a hint.
-    // This is a dummy example that hard-codes the answer for inputs 1 and 4.
-    let sqrt_hint: int -> int = |x| match x {
-        1 => 1,
-        4 => 2
-    };
+    let sqrt_hint: fe -> fe = |x| std::convert::fe(sqrt_rec(std::convert::int(x), std::convert::int(x)));
+
+    // This function computes the square root of an integer or at least
+    // the largest integer smaller than the square root if the input
+    // is not a square.
+    // The parameter `y` is a guess, which can be equal to `x`.
+    let sqrt_rec: int, int -> int = |y, x|
+        if y * y <= x && (y + 1) * (y + 1) > x {
+            y
+        } else {
+            sqrt_rec((y + x / y) / 2, x)
+        };
 
     col witness y(i) query ("hint", sqrt_hint(x(i)));