Get benchmarks working again

Author: wedesoft

bench/Makefile.am

@@ -1,6 +1,6 @@
 SUFFIXES = .c .scm
 
-BENCH_ENVIRONMENT = LD_LIBRARY_PATH=$(srcdir)/.libs:$(LD_LIBRARY_PATH) \
+BENCH_ENVIRONMENT = LD_LIBRARY_PATH=$(srcdir)/.libs:$(top_builddir)/aiscm/.libs:$(LD_LIBRARY_PATH) \
 	GC_INITIAL_HEAP_SIZE=1G GC_USE_ENTIRE_HEAP=Y
 
 EXTRA_LTLIBRARIES = libguile-aiscm-bench.la
@@ -13,7 +13,7 @@ libguile_aiscm_bench_la_LIBADD = $(GUILE_LIBS)
 noinst_DATA = bench.scm
 
 bench-local: bench.scm libguile-aiscm-bench.la
-	$(BENCH_ENVIRONMENT) $(GUILE) bench.scm
+	$(BENCH_ENVIRONMENT) $(GUILE) -L $(top_builddir) bench.scm
 
 EXTRA_DIST = bench.scm
 

bench/bench.scm

@@ -1,11 +1,4 @@
-(use-modules (oop goops)
-             (aiscm element)
-             (aiscm int)
-             (aiscm pointer)
-             (aiscm sequence)
-             (aiscm jit)
-             (aiscm op)
-             (aiscm util))
+(use-modules (oop goops) (aiscm core) (aiscm util) (ice-9 format))
 
 (load-extension "libguile-aiscm-bench" "init_bench")
 
@@ -30,20 +23,20 @@
 (define n 1000)
 (define size 250000)
 (define ptr (gc-malloc-pointerless (* (size-of <int>) size)))
-(define <sequence<int>> (sequence <int>))
-(define empty (make <sequence<int>> #:size 0))
-(define s (make <sequence<int>> #:size size))
+(define <sequence<int>> (multiarray <int> 1))
+(define empty (make <sequence<int>> #:shape '(0)))
+(define s (make <sequence<int>> #:shape (list size)))
 (define-class <c> ())
 (define-method (neg (self <c>)) self)
 (define c (make <c>))
 
 (format #t "~32t ~10@a ~10@a ~10@a  ~10@a~%" "user" "system" "total" "real")
 
 (run "Guile GOOPS method dispatch" n (neg c))
-(run "Guile make empty sequence" n (make <sequence<int>> #:size 0))
+(run "Guile make empty sequence" n (make <sequence<int>> #:shape '(0)))
 (run "Guile allocate memory" n (gc-malloc-pointerless (* (size-of <int>) size)))
 (run "Guile negate empty sequence" n (- empty))
-(run "Guile make sequence" n (make <sequence<int>> #:size size))
+(run "Guile make sequence" n (make <sequence<int>> #:shape (list size)))
 (run "Guile negate sequence" n (- s))
 (run "C allocate memory" n (allocation (* (size-of <int>) size)))
 (run "C negate empty sequence" n (negate ptr 1 0))