ase: cummulative updates

softwarelanguageslab · Dec 26, 2024 · 230ca4e · 230ca4e
1 parent 52f59f9
commit 230ca4e
Show file tree

Hide file tree

Showing 50 changed files with 117,012 additions and 2,373 deletions.
diff --git a/analyses/simpleactor/app/ASE/Benchmark.hs b/analyses/simpleactor/app/ASE/Benchmark.hs
@@ -44,7 +44,7 @@ benchmarkOptions = BenchmarkOptions <$> strOption ( long "file" <> short 'f' <>
 
 benchmarkCmd :: BenchmarkOptions -> IO () 
 benchmarkCmd (BenchmarkOptions { .. }) = do 
-      let benchmarks = testBenchmarkPrograms
+      let benchmarks = benchmarkPrograms
       putStrLn "Running precision benchmarks"
       runPrecisionBenchmarks benchmarks precisionBenchmarkOutput
       putStrLn "Running time benchmarks"
@@ -59,41 +59,41 @@ benchmarkCmd (BenchmarkOptions { .. }) = do
 
 benchmarkPrograms :: [String]
 benchmarkPrograms = [
-      "games_snake.rkt",
-      "games_tetris.rkt",
-      "games_zombie.rkt",
-      "mochi_fold-div.rkt",
-      "mochi_hors.rkt",
-      "mochi_hrec.rkt",
-      "mochi_l-zipunzip.rkt",
-      "mochi_map-foldr.rkt",
-      "mochi_mappend.rkt",
-      "mochi_mem.rkt",
-      "mochi_mult.rkt",
-      "mochi_neg.rkt",
-      "mochi_nth0.rkt",
-      "mochi_r-file.rkt",
-      "mochi_r-lock.rkt",
-      "mochi_reverse.rkt",
-      "mochi_sum.rkt",
-      "mochi_zip.rkt",
-      "sergey_blur.rkt",
-      "sergey_eta.rkt",
-      "sergey_kcfa2.rkt",
-      "sergey_kcfa3.rkt",
-      "sergey_loop2.rkt",
-      "sergey_mj09.rkt",
-      "sergey_sat.rkt",
-      "softy_append.rkt",
-      "softy_cpstak.rkt",
-      "softy_last-pair.rkt",
-      "softy_last.rkt",
-      "softy_length-acc.rkt",
-      "softy_length.rkt",
-      "softy_member.rkt",
-      "softy_recursive-div2.rkt",
-      "softy_subst.rkt",
-      "softy_tak.rkt"
+      "benchmarks-out/games_snake.rkt",
+      "benchmarks-out/games_tetris.rkt",
+      "benchmarks-out/games_zombie.rkt",
+      "benchmarks-out/mochi_fold-div.rkt",
+      "benchmarks-out/mochi_hors.rkt",
+      "benchmarks-out/mochi_hrec.rkt",
+      "benchmarks-out/mochi_l-zipunzip.rkt",
+      "benchmarks-out/mochi_map-foldr.rkt",
+      "benchmarks-out/mochi_mappend.rkt",
+      "benchmarks-out/mochi_mem.rkt",
+      "benchmarks-out/mochi_mult.rkt",
+      "benchmarks-out/mochi_neg.rkt",
+      "benchmarks-out/mochi_nth0.rkt",
+      "benchmarks-out/mochi_r-file.rkt",
+      "benchmarks-out/mochi_r-lock.rkt",
+      "benchmarks-out/mochi_reverse.rkt",
+      "benchmarks-out/mochi_sum.rkt",
+      "benchmarks-out/mochi_zip.rkt",
+      "benchmarks-out/sergey_blur.rkt",
+      "benchmarks-out/sergey_eta.rkt",
+      "benchmarks-out/sergey_kcfa2.rkt",
+      "benchmarks-out/sergey_kcfa3.rkt",
+      "benchmarks-out/sergey_loop2.rkt",
+      "benchmarks-out/sergey_mj09.rkt",
+      "benchmarks-out/sergey_sat.rkt",
+      "benchmarks-out/softy_append.rkt",
+      "benchmarks-out/softy_cpstak.rkt",
+      "benchmarks-out/softy_last-pair.rkt",
+      "benchmarks-out/softy_last.rkt",
+      "benchmarks-out/softy_length-acc.rkt",
+      "benchmarks-out/softy_length.rkt",
+      "benchmarks-out/softy_member.rkt",
+      "benchmarks-out/softy_recursive-div2.rkt",
+      "benchmarks-out/softy_subst.rkt",
+      "benchmarks-out/softy_tak.rkt"
    ]
 
 testBenchmarkPrograms :: [String] 

diff --git a/analyses/simpleactor/benchmarks-in/games_snake.rkt b/analyses/simpleactor/benchmarks-in/games_snake.rkt
@@ -21,8 +21,8 @@
 (struct snake (dir segs))
 (struct world (snake food))
 (define DIR/C (one-of/c 'up 'down 'left 'right))
-(define POSN/C (struct/c posn real? real?))
-(define SNAKE/C (struct/c snake DIR/C (and/c cons? (listof POSN/C))))
+(define POSN/C (struct/c posn real?/c real?/c))
+(define SNAKE/C (struct/c snake DIR/C (and/c cons?/c (listof POSN/C))))
 (define WORLD/C (struct/c world SNAKE/C POSN/C))
 
 

diff --git a/analyses/simpleactor/benchmarks-in/games_tetris.rkt b/analyses/simpleactor/benchmarks-in/games_tetris.rkt
@@ -9,8 +9,8 @@
 (struct world (tetra blocks))
 (struct posn (x y))
 (define COLOR/C symbol?)
-(define POSN/C (struct/c posn real? real?))
-(define BLOCK/C (struct/c block real? real? COLOR/C))
+(define POSN/C (struct/c posn real?/c real?/c))
+(define BLOCK/C (struct/c block real?/c real?/c COLOR/C))
 (define BSET/C (listof BLOCK/C))
 (define TETRA/C (struct/c tetra POSN/C BSET/C))
 (define WORLD/C (struct/c world TETRA/C BSET/C))
@@ -455,15 +455,15 @@
   [overlay (-> image? image? image?)]
   [circle (-> real?/c real?/c string?/c image?)]
   [rectangle (-> real?/c real?/c COLOR/C COLOR/C image?)]
-  [place-image (-> image?/c real?/c real?/c image?/c image?/c)]
+  [place-image (-> image/c real?/c real?/c image/c image/c)]
   [empty-scene (-> real?/c real?/c image?)]
   ;; aux
   [list-pick-random (-> (and/c cons?/c (listof TETRA/C)) TETRA/C)]
   [neg-1 integer?/c] ;; ha!
   ;; visual
-  [world->image (-> WORLD/C image?/c)]
-  [blocks->image (-> BSET/C image?/c)]
-  [block->image (-> BLOCK/C image?/c)]
-  [place-block (-> BLOCK/C image?/c image?/c)]
+  [world->image (-> WORLD/C image/c)]
+  [blocks->image (-> BSET/C image/c)]
+  [block->image (-> BLOCK/C image/c)]
+  [place-block (-> BLOCK/C image/c image/c)]
   [world0 (-> (and/c cons?/c (listof TETRA/C)) WORLD/C)]
   ))