From 09cb4ceeaf010015922f69de8d0bb4297489fc91 Mon Sep 17 00:00:00 2001
From: Stuart Pernsteiner <spernsteiner@galois.com>
Date: Fri, 29 Mar 2024 13:09:05 -0700
Subject: [PATCH 1/4] analyze: add scripts for computing pointwise metrics

---
 c2rust-analyze/scripts/pointwise_metrics.py   | 65 ++++++++++++++++++
 c2rust-analyze/scripts/pointwise_try_build.sh | 33 ++++++++++
 .../scripts/pointwise_try_build_unmodified.sh | 36 ++++++++++
 .../scripts/run_pointwise_metrics_lighttpd.sh | 66 +++++++++++++++++++
 4 files changed, 200 insertions(+)
 create mode 100644 c2rust-analyze/scripts/pointwise_metrics.py
 create mode 100755 c2rust-analyze/scripts/pointwise_try_build.sh
 create mode 100755 c2rust-analyze/scripts/pointwise_try_build_unmodified.sh
 create mode 100755 c2rust-analyze/scripts/run_pointwise_metrics_lighttpd.sh

diff --git a/c2rust-analyze/scripts/pointwise_metrics.py b/c2rust-analyze/scripts/pointwise_metrics.py
new file mode 100644
index 0000000000..994b2e303a
--- /dev/null
+++ b/c2rust-analyze/scripts/pointwise_metrics.py
@@ -0,0 +1,65 @@
+'''
+Process logs to compute pointwise success rate metrics.
+
+These metrics are measured as follows.  For each function, we run the static
+analysis and rewrite that function in isolation, producing a new `.rs` file
+where that function has been rewritten but all other code remains the same.
+Then we remove the `unsafe` qualifier from the target function and try to
+compile the code.  The "pointwise success rate" is the number of functions on
+which this procedure succeeds.
+
+As a performance optimization, instead of running analysis separately for each
+function, we run `c2rust-analyze` with `--rewrite-mode pointwise`, which runs
+the analysis part once and then rewrites each function in isolation using the
+same analysis results.  This provides a significant speedup for large codebases
+where the static analysis portion is very slow.
+
+To provide a basis for comparison, in addition to attempting to compile all
+pointwise rewrites, we also try removing `unsafe` and compiling each function
+in the original, unmodified code.  This provides a baseline for how many
+functions are "trivially safe" without rewriting.
+'''
+
+from pprint import pprint
+import re
+import sys
+
+# `pointwise_log_path` should be a log generated by running
+# `pointwise_try_build.sh` on each output file of a pointwise rewrite
+# (`foo.*.rs`, one per function).  The outputs for all files should be
+# concatenated in a single log.  This gives the results of pointwise rewriting
+# and compiling each function.
+#
+# `unmodified_log_path` should come from `pointwise_try_build_unmodified.sh`
+# instead.  This gives results of pointwise compiling each function without
+# rewriting.
+pointwise_log_path, unmodified_log_path = sys.argv[1:]
+
+
+FUNC_ERRORS_RE = re.compile(r'^got ([0-9]+) errors for ([^ \n]+)$')
+
+def read_func_errors(f):
+    func_errors = {}
+    for line in f:
+        m = FUNC_ERRORS_RE.match(line)
+        if m is None:
+            continue
+        func = m.group(2)
+        errors = int(m.group(1))
+        assert func not in func_errors, 'duplicate entry for %r' % func
+        func_errors[func] = errors
+    return func_errors
+
+pointwise_func_errors = read_func_errors(open(pointwise_log_path))
+pointwise_ok = set(func for func, errors in pointwise_func_errors.items() if errors == 0)
+print('pointwise:  %5d/%d functions passed' % (
+    len(pointwise_ok), len(pointwise_func_errors)))
+
+unmodified_func_errors = read_func_errors(open(unmodified_log_path))
+unmodified_ok = set(func for func, errors in unmodified_func_errors.items() if errors == 0)
+print('unmodified: %5d/%d functions passed' % (
+    len(unmodified_ok), len(unmodified_func_errors)))
+
+improved = pointwise_ok - unmodified_ok
+print('improved %d functions' % len(improved))
+print('broke %d functions' % len(unmodified_ok - pointwise_ok))
diff --git a/c2rust-analyze/scripts/pointwise_try_build.sh b/c2rust-analyze/scripts/pointwise_try_build.sh
new file mode 100755
index 0000000000..f3eeada292
--- /dev/null
+++ b/c2rust-analyze/scripts/pointwise_try_build.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+set -euo pipefail
+
+echo
+
+f=$1
+shift 1
+flags=( "$@" )
+echo "f=$f"
+
+name=${f%%.*.rs}
+name=${name##**/}
+echo "name=$name"
+
+func=${f%.rs}
+func=${func##*.}
+echo "func=$func"
+
+filter_errors() {
+    jq 'select(.level == "error") | .message' -r |
+        { grep -v -e '^aborting due to ' -e '^call to unsafe function is unsafe ' || true; }
+}
+
+sed -i -e "/fn $func\\>/s/\\<unsafe //" $f
+rustc --error-format json --emit metadata --crate-name $name "$f" "${flags[@]}" 2>rustc-$func.json || true
+num_lines="$(cat rustc-$func.json | filter_errors | wc -l)"
+echo "got $num_lines errors for $func"
+if [[ "$num_lines" -eq 0 ]]; then
+    exit 0
+else
+    cat rustc-$func.json | filter_errors
+    exit 1
+fi
diff --git a/c2rust-analyze/scripts/pointwise_try_build_unmodified.sh b/c2rust-analyze/scripts/pointwise_try_build_unmodified.sh
new file mode 100755
index 0000000000..10c4d9fee0
--- /dev/null
+++ b/c2rust-analyze/scripts/pointwise_try_build_unmodified.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+set -euo pipefail
+
+echo
+
+f=$1
+shift 1
+flags=( "$@" )
+echo "f=$f"
+
+name=${f%%.*.rs}
+name=${name##**/}
+echo "name=$name"
+
+func=${f%.rs}
+func=${func##*.}
+echo "func=$func"
+
+filter_errors() {
+    jq 'select(.level == "error") | .message' -r |
+        { grep -v -e '^aborting due to ' -e '^call to unsafe function is unsafe ' || true; }
+}
+
+d="$(dirname "$f")"
+f="$d/${name}_safe_${func}.rs"
+cp "$d/$name.rs" "$f"
+sed -i -e "/fn $func\\>/s/\\<unsafe //" $f
+rustc --error-format json --emit metadata --crate-name $name "$f" "${flags[@]}" 2>rustc-$func.json || true
+num_lines="$(cat rustc-$func.json | filter_errors | wc -l)"
+echo "got $num_lines errors for $func"
+if [[ "$num_lines" -eq 0 ]]; then
+    exit 0
+else
+    cat rustc-$func.json | filter_errors
+    exit 1
+fi
diff --git a/c2rust-analyze/scripts/run_pointwise_metrics_lighttpd.sh b/c2rust-analyze/scripts/run_pointwise_metrics_lighttpd.sh
new file mode 100755
index 0000000000..18cb1268d7
--- /dev/null
+++ b/c2rust-analyze/scripts/run_pointwise_metrics_lighttpd.sh
@@ -0,0 +1,66 @@
+#!/bin/bash
+set -euo pipefail
+
+# Run pointwise metrics on lighttpd_rust_amalgamated.
+
+if [[ $# -ne 1 ]]; then
+  echo "Usage: $0 <path/to/lighttpd_rust_amalgamated/>"
+  exit 1
+fi
+
+SCRIPT_DIR="$(dirname "$0")"
+
+# Get the path to lighttpd_rust_amalgamated
+MODULE_DIR="$1"
+shift 1
+
+# Find the sysroot directory of rustc
+SYSROOT="$(rustc --print sysroot)"
+
+# Find the necessary rlibs
+extern() {
+  local name=$1
+  local rlib=$(find "$MODULE_DIR/target/debug/deps" -name "lib${name}*.rlib" -print -quit)
+  echo >&2 "found rlib for $name: $rlib"
+  echo --extern $name=$rlib
+}
+
+rustc_flags=(
+    --edition 2021
+    --crate-type rlib
+    #--sysroot "$SYSROOT"
+    -L "dependency=$MODULE_DIR/target/debug/deps"
+    $(extern c2rust_bitfields)
+    $(extern libc)
+    -A warnings
+)
+
+
+now=$(date +%Y%m%d-%H%M%S)
+
+# Run c2rust-analyze in pointwise mode
+C2RUST_ANALYZE_NO_CARGO=1 \
+C2RUST_ANALYZE_REWRITE_MODE=pointwise \
+C2RUST_ANALYZE_USE_MANUAL_SHIMS=1 \
+cargo run --bin c2rust-analyze --release -- "$MODULE_DIR/src/main.rs" \
+    --crate-name "$(basename "$MODULE_DIR")" \
+    "${rustc_flags[@]}" \
+    |& tee pointwise-lighttpd-analyze-$now.log \
+    || true
+
+# Try to compile each function separately.
+
+pointwise_log_file=pointwise-lighttpd-pointwise-$now.log
+for f in "$MODULE_DIR"/src/main.*.rs; do
+    "$SCRIPT_DIR/pointwise_try_build.sh" "$f" "${rustc_flags[@]}" || true
+done |& tee "$pointwise_log_file"
+
+unmodified_log_file=pointwise-lighttpd-unmodified-$now.log
+for f in "$MODULE_DIR"/src/main.*.rs; do
+    "$SCRIPT_DIR/pointwise_try_build_unmodified.sh" "$f" "${rustc_flags[@]}" || true
+done |& tee "$unmodified_log_file"
+
+echo
+echo 
+
+python3 "$SCRIPT_DIR/pointwise_metrics.py" "$pointwise_log_file" "$unmodified_log_file"

From 944667a6ede6fc8a2682acabd5877c5a3f05212c Mon Sep 17 00:00:00 2001
From: Stuart Pernsteiner <spernsteiner@galois.com>
Date: Tue, 2 Apr 2024 16:28:01 -0700
Subject: [PATCH 2/4] analyze: scripts: improve pointwise_metrics.py output

---
 c2rust-analyze/scripts/pointwise_metrics.py | 22 +++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/c2rust-analyze/scripts/pointwise_metrics.py b/c2rust-analyze/scripts/pointwise_metrics.py
index 994b2e303a..6cb6cf0ede 100644
--- a/c2rust-analyze/scripts/pointwise_metrics.py
+++ b/c2rust-analyze/scripts/pointwise_metrics.py
@@ -52,14 +52,24 @@ def read_func_errors(f):
 
 pointwise_func_errors = read_func_errors(open(pointwise_log_path))
 pointwise_ok = set(func for func, errors in pointwise_func_errors.items() if errors == 0)
-print('pointwise:  %5d/%d functions passed' % (
-    len(pointwise_ok), len(pointwise_func_errors)))
+print('pointwise:  %5d/%d functions passed (%.1f%%)' % (
+    len(pointwise_ok), len(pointwise_func_errors),
+    len(pointwise_ok) / len(pointwise_func_errors) * 100))
 
 unmodified_func_errors = read_func_errors(open(unmodified_log_path))
 unmodified_ok = set(func for func, errors in unmodified_func_errors.items() if errors == 0)
-print('unmodified: %5d/%d functions passed' % (
-    len(unmodified_ok), len(unmodified_func_errors)))
+print('unmodified: %5d/%d functions passed (%.1f%%)' % (
+    len(unmodified_ok), len(unmodified_func_errors),
+    len(unmodified_ok) / len(unmodified_func_errors) * 100))
+
+assert len(pointwise_func_errors) == len(unmodified_func_errors)
+num_total = len(pointwise_func_errors)
+num_unmodified_ok = len(unmodified_ok)
+num_unmodified_bad = num_total - num_unmodified_ok
 
 improved = pointwise_ok - unmodified_ok
-print('improved %d functions' % len(improved))
-print('broke %d functions' % len(unmodified_ok - pointwise_ok))
+print('improved:   %5d/%d functions (%.1f%%)' % (
+    len(improved), num_unmodified_bad, len(improved) / num_unmodified_bad * 100))
+broke = unmodified_ok - pointwise_ok
+print('broke:      %5d/%d functions (%.1f%%)' % (
+    len(broke), num_unmodified_ok, len(broke) / num_unmodified_ok * 100))

From 08fb4755e2f0cdcba94c769642b263326b3cca7f Mon Sep 17 00:00:00 2001
From: Stuart Pernsteiner <spernsteiner@galois.com>
Date: Thu, 4 Apr 2024 13:30:38 -0700
Subject: [PATCH 3/4] analyze: add script for CFS metrics

---
 .../scripts/run_pointwise_metrics_cfs.sh      | 65 +++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100755 c2rust-analyze/scripts/run_pointwise_metrics_cfs.sh

diff --git a/c2rust-analyze/scripts/run_pointwise_metrics_cfs.sh b/c2rust-analyze/scripts/run_pointwise_metrics_cfs.sh
new file mode 100755
index 0000000000..54300c15b9
--- /dev/null
+++ b/c2rust-analyze/scripts/run_pointwise_metrics_cfs.sh
@@ -0,0 +1,65 @@
+#!/bin/bash
+set -euo pipefail
+
+# Run pointwise metrics on cfs_rust_amalgamated.
+
+if [[ $# -ne 1 ]]; then
+  echo "Usage: $0 <path/to/cfs_rust_amalgamated/>"
+  exit 1
+fi
+
+SCRIPT_DIR="$(dirname "$0")"
+
+# Get the path to cfs_rust_amalgamated
+MODULE_DIR="$1"
+shift 1
+
+
+now=$(date +%Y%m%d-%H%M%S)
+
+# Run c2rust-analyze in pointwise mode
+: cargo run --bin c2rust-analyze --release -- \
+    --rewrite-mode pointwise --use-manual-shims -- \
+    build --manifest-path "$MODULE_DIR/Cargo.toml" \
+    |& tee pointwise-cfs-analyze-$now.log \
+    || true
+
+# Try to compile each function separately.
+
+# Find the sysroot directory of rustc
+SYSROOT="$(rustc --print sysroot)"
+
+# Find the necessary rlibs
+extern() {
+  local name=$1
+  local rlib=$(find "$MODULE_DIR/target/debug/deps" -name "lib${name}*.rlib" -print -quit)
+  echo >&2 "found rlib for $name: $rlib"
+  echo --extern $name=$rlib
+}
+
+rustc_flags=(
+    --edition 2021
+    --crate-type rlib
+    #--sysroot "$SYSROOT"
+    -L "dependency=$MODULE_DIR/target/debug/deps"
+    $(extern c2rust_bitfields)
+    $(extern f128)
+    $(extern libc)
+    $(extern memoffset)
+    -A warnings
+)
+
+pointwise_log_file=pointwise-cfs-pointwise-$now.log
+for f in "$MODULE_DIR"/src/main.*.rs; do
+    "$SCRIPT_DIR/pointwise_try_build.sh" "$f" "${rustc_flags[@]}" || true
+done |& tee "$pointwise_log_file"
+
+unmodified_log_file=pointwise-cfs-unmodified-$now.log
+for f in "$MODULE_DIR"/src/main.*.rs; do
+    "$SCRIPT_DIR/pointwise_try_build_unmodified.sh" "$f" "${rustc_flags[@]}" || true
+done |& tee "$unmodified_log_file"
+
+echo
+echo 
+
+python3 "$SCRIPT_DIR/pointwise_metrics.py" "$pointwise_log_file" "$unmodified_log_file"

From 833e5f6c0e91790b0996546fe93cf7090fdc5ac2 Mon Sep 17 00:00:00 2001
From: Stuart Pernsteiner <spernsteiner@galois.com>
Date: Mon, 29 Apr 2024 11:18:25 -0700
Subject: [PATCH 4/4] analyze: unify similar metrics scripts

---
 c2rust-analyze/scripts/pointwise_try_build.sh | 21 +++-
 .../scripts/pointwise_try_build_unmodified.sh | 36 -------
 .../scripts/run_pointwise_metrics.sh          | 99 +++++++++++++++++++
 .../scripts/run_pointwise_metrics_cfs.sh      | 65 ------------
 .../scripts/run_pointwise_metrics_lighttpd.sh | 66 -------------
 5 files changed, 118 insertions(+), 169 deletions(-)
 delete mode 100755 c2rust-analyze/scripts/pointwise_try_build_unmodified.sh
 create mode 100755 c2rust-analyze/scripts/run_pointwise_metrics.sh
 delete mode 100755 c2rust-analyze/scripts/run_pointwise_metrics_cfs.sh
 delete mode 100755 c2rust-analyze/scripts/run_pointwise_metrics_lighttpd.sh

diff --git a/c2rust-analyze/scripts/pointwise_try_build.sh b/c2rust-analyze/scripts/pointwise_try_build.sh
index f3eeada292..b0593f0963 100755
--- a/c2rust-analyze/scripts/pointwise_try_build.sh
+++ b/c2rust-analyze/scripts/pointwise_try_build.sh
@@ -4,9 +4,11 @@ set -euo pipefail
 echo
 
 f=$1
-shift 1
+mode=$2
+shift 2
 flags=( "$@" )
 echo "f=$f"
+echo "mode=$mode"
 
 name=${f%%.*.rs}
 name=${name##**/}
@@ -21,7 +23,22 @@ filter_errors() {
         { grep -v -e '^aborting due to ' -e '^call to unsafe function is unsafe ' || true; }
 }
 
-sed -i -e "/fn $func\\>/s/\\<unsafe //" $f
+case "$mode" in
+    pointwise)
+        sed -i -e "/fn $func\\>/s/\\<unsafe //" $f
+        ;;
+    unmodified)
+        d="$(dirname "$f")"
+        f="$d/${name}_safe_${func}.rs"
+        cp "$d/$name.rs" "$f"
+        sed -i -e "/fn $func\\>/s/\\<unsafe //" $f
+        ;;
+    *)
+        echo "unsupported mode $mode" 1>&2
+        exit 1
+        ;;
+esac
+
 rustc --error-format json --emit metadata --crate-name $name "$f" "${flags[@]}" 2>rustc-$func.json || true
 num_lines="$(cat rustc-$func.json | filter_errors | wc -l)"
 echo "got $num_lines errors for $func"
diff --git a/c2rust-analyze/scripts/pointwise_try_build_unmodified.sh b/c2rust-analyze/scripts/pointwise_try_build_unmodified.sh
deleted file mode 100755
index 10c4d9fee0..0000000000
--- a/c2rust-analyze/scripts/pointwise_try_build_unmodified.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-echo
-
-f=$1
-shift 1
-flags=( "$@" )
-echo "f=$f"
-
-name=${f%%.*.rs}
-name=${name##**/}
-echo "name=$name"
-
-func=${f%.rs}
-func=${func##*.}
-echo "func=$func"
-
-filter_errors() {
-    jq 'select(.level == "error") | .message' -r |
-        { grep -v -e '^aborting due to ' -e '^call to unsafe function is unsafe ' || true; }
-}
-
-d="$(dirname "$f")"
-f="$d/${name}_safe_${func}.rs"
-cp "$d/$name.rs" "$f"
-sed -i -e "/fn $func\\>/s/\\<unsafe //" $f
-rustc --error-format json --emit metadata --crate-name $name "$f" "${flags[@]}" 2>rustc-$func.json || true
-num_lines="$(cat rustc-$func.json | filter_errors | wc -l)"
-echo "got $num_lines errors for $func"
-if [[ "$num_lines" -eq 0 ]]; then
-    exit 0
-else
-    cat rustc-$func.json | filter_errors
-    exit 1
-fi
diff --git a/c2rust-analyze/scripts/run_pointwise_metrics.sh b/c2rust-analyze/scripts/run_pointwise_metrics.sh
new file mode 100755
index 0000000000..dea8e6e6cf
--- /dev/null
+++ b/c2rust-analyze/scripts/run_pointwise_metrics.sh
@@ -0,0 +1,99 @@
+#!/bin/bash
+set -euo pipefail
+
+# Run pointwise metrics on lighttpd_rust_amalgamated.
+
+if [[ $# -ne 1 ]]; then
+  echo "Usage: $0 <path/to/lighttpd_rust_amalgamated/>"
+  exit 1
+fi
+
+SCRIPT_DIR="$(dirname "$0")"
+
+# Get the path to lighttpd_rust_amalgamated
+MODULE_DIR="$1"
+shift 1
+
+# Find the sysroot directory of rustc
+SYSROOT="$(rustc --print sysroot)"
+
+# Find the necessary rlibs
+extern() {
+  local name=$1
+  local rlib=$(find "$MODULE_DIR/target/debug/deps" -name "lib${name}*.rlib" -print -quit)
+  echo >&2 "found rlib for $name: $rlib"
+  echo --extern $name=$rlib
+}
+
+now=$(date +%Y%m%d-%H%M%S)
+
+
+# Set $rustc_flags and run the analysis as appropriate for the target project.
+# $rustc_flags is also used below for `pointwise_try_build.sh`.
+project="$(basename "$MODULE_DIR")"
+case "$project" in
+    lighttpd_*)
+        rustc_flags=(
+            --edition 2021
+            --crate-type rlib
+            #--sysroot "$SYSROOT"
+            -L "dependency=$MODULE_DIR/target/debug/deps"
+            $(extern c2rust_bitfields)
+            $(extern libc)
+            -A warnings
+        )
+
+        C2RUST_ANALYZE_NO_CARGO=1 \
+        C2RUST_ANALYZE_REWRITE_MODE=pointwise \
+        C2RUST_ANALYZE_USE_MANUAL_SHIMS=1 \
+        cargo run --bin c2rust-analyze --release -- "$MODULE_DIR/src/main.rs" \
+            --crate-name "$(basename "$MODULE_DIR")" \
+            "${rustc_flags[@]}" \
+            |& tee pointwise-lighttpd-analyze-$now.log \
+            || true
+
+        ;;
+
+    cfs_*)
+        : cargo run --bin c2rust-analyze --release -- \
+            --rewrite-mode pointwise --use-manual-shims -- \
+            build --manifest-path "$MODULE_DIR/Cargo.toml" \
+            |& tee pointwise-cfs-analyze-$now.log \
+            || true
+
+        rustc_flags=(
+            --edition 2021
+            --crate-type rlib
+            #--sysroot "$SYSROOT"
+            -L "dependency=$MODULE_DIR/target/debug/deps"
+            $(extern c2rust_bitfields)
+            $(extern f128)
+            $(extern libc)
+            $(extern memoffset)
+            -A warnings
+        )
+
+        ;;
+
+    *)
+        echo "unsupported project $project" 1>&2
+        exit 1
+esac
+
+
+# Try to compile each function separately.
+
+pointwise_log_file=pointwise-lighttpd-pointwise-$now.log
+for f in "$MODULE_DIR"/src/main.*.rs; do
+    "$SCRIPT_DIR/pointwise_try_build.sh" "$f" pointwise "${rustc_flags[@]}" || true
+done |& tee "$pointwise_log_file"
+
+unmodified_log_file=pointwise-lighttpd-unmodified-$now.log
+for f in "$MODULE_DIR"/src/main.*.rs; do
+    "$SCRIPT_DIR/pointwise_try_build.sh" "$f" unmodified "${rustc_flags[@]}" || true
+done |& tee "$unmodified_log_file"
+
+echo
+echo 
+
+python3 "$SCRIPT_DIR/pointwise_metrics.py" "$pointwise_log_file" "$unmodified_log_file"
diff --git a/c2rust-analyze/scripts/run_pointwise_metrics_cfs.sh b/c2rust-analyze/scripts/run_pointwise_metrics_cfs.sh
deleted file mode 100755
index 54300c15b9..0000000000
--- a/c2rust-analyze/scripts/run_pointwise_metrics_cfs.sh
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-# Run pointwise metrics on cfs_rust_amalgamated.
-
-if [[ $# -ne 1 ]]; then
-  echo "Usage: $0 <path/to/cfs_rust_amalgamated/>"
-  exit 1
-fi
-
-SCRIPT_DIR="$(dirname "$0")"
-
-# Get the path to cfs_rust_amalgamated
-MODULE_DIR="$1"
-shift 1
-
-
-now=$(date +%Y%m%d-%H%M%S)
-
-# Run c2rust-analyze in pointwise mode
-: cargo run --bin c2rust-analyze --release -- \
-    --rewrite-mode pointwise --use-manual-shims -- \
-    build --manifest-path "$MODULE_DIR/Cargo.toml" \
-    |& tee pointwise-cfs-analyze-$now.log \
-    || true
-
-# Try to compile each function separately.
-
-# Find the sysroot directory of rustc
-SYSROOT="$(rustc --print sysroot)"
-
-# Find the necessary rlibs
-extern() {
-  local name=$1
-  local rlib=$(find "$MODULE_DIR/target/debug/deps" -name "lib${name}*.rlib" -print -quit)
-  echo >&2 "found rlib for $name: $rlib"
-  echo --extern $name=$rlib
-}
-
-rustc_flags=(
-    --edition 2021
-    --crate-type rlib
-    #--sysroot "$SYSROOT"
-    -L "dependency=$MODULE_DIR/target/debug/deps"
-    $(extern c2rust_bitfields)
-    $(extern f128)
-    $(extern libc)
-    $(extern memoffset)
-    -A warnings
-)
-
-pointwise_log_file=pointwise-cfs-pointwise-$now.log
-for f in "$MODULE_DIR"/src/main.*.rs; do
-    "$SCRIPT_DIR/pointwise_try_build.sh" "$f" "${rustc_flags[@]}" || true
-done |& tee "$pointwise_log_file"
-
-unmodified_log_file=pointwise-cfs-unmodified-$now.log
-for f in "$MODULE_DIR"/src/main.*.rs; do
-    "$SCRIPT_DIR/pointwise_try_build_unmodified.sh" "$f" "${rustc_flags[@]}" || true
-done |& tee "$unmodified_log_file"
-
-echo
-echo 
-
-python3 "$SCRIPT_DIR/pointwise_metrics.py" "$pointwise_log_file" "$unmodified_log_file"
diff --git a/c2rust-analyze/scripts/run_pointwise_metrics_lighttpd.sh b/c2rust-analyze/scripts/run_pointwise_metrics_lighttpd.sh
deleted file mode 100755
index 18cb1268d7..0000000000
--- a/c2rust-analyze/scripts/run_pointwise_metrics_lighttpd.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-# Run pointwise metrics on lighttpd_rust_amalgamated.
-
-if [[ $# -ne 1 ]]; then
-  echo "Usage: $0 <path/to/lighttpd_rust_amalgamated/>"
-  exit 1
-fi
-
-SCRIPT_DIR="$(dirname "$0")"
-
-# Get the path to lighttpd_rust_amalgamated
-MODULE_DIR="$1"
-shift 1
-
-# Find the sysroot directory of rustc
-SYSROOT="$(rustc --print sysroot)"
-
-# Find the necessary rlibs
-extern() {
-  local name=$1
-  local rlib=$(find "$MODULE_DIR/target/debug/deps" -name "lib${name}*.rlib" -print -quit)
-  echo >&2 "found rlib for $name: $rlib"
-  echo --extern $name=$rlib
-}
-
-rustc_flags=(
-    --edition 2021
-    --crate-type rlib
-    #--sysroot "$SYSROOT"
-    -L "dependency=$MODULE_DIR/target/debug/deps"
-    $(extern c2rust_bitfields)
-    $(extern libc)
-    -A warnings
-)
-
-
-now=$(date +%Y%m%d-%H%M%S)
-
-# Run c2rust-analyze in pointwise mode
-C2RUST_ANALYZE_NO_CARGO=1 \
-C2RUST_ANALYZE_REWRITE_MODE=pointwise \
-C2RUST_ANALYZE_USE_MANUAL_SHIMS=1 \
-cargo run --bin c2rust-analyze --release -- "$MODULE_DIR/src/main.rs" \
-    --crate-name "$(basename "$MODULE_DIR")" \
-    "${rustc_flags[@]}" \
-    |& tee pointwise-lighttpd-analyze-$now.log \
-    || true
-
-# Try to compile each function separately.
-
-pointwise_log_file=pointwise-lighttpd-pointwise-$now.log
-for f in "$MODULE_DIR"/src/main.*.rs; do
-    "$SCRIPT_DIR/pointwise_try_build.sh" "$f" "${rustc_flags[@]}" || true
-done |& tee "$pointwise_log_file"
-
-unmodified_log_file=pointwise-lighttpd-unmodified-$now.log
-for f in "$MODULE_DIR"/src/main.*.rs; do
-    "$SCRIPT_DIR/pointwise_try_build_unmodified.sh" "$f" "${rustc_flags[@]}" || true
-done |& tee "$unmodified_log_file"
-
-echo
-echo 
-
-python3 "$SCRIPT_DIR/pointwise_metrics.py" "$pointwise_log_file" "$unmodified_log_file"