Commit 38add412 authored by Daniel Kochmański's avatar Daniel Kochmański

pathnames: don't use logical pathnames

Using them caused some problems with abcl (potentially also with
others).
parent 579fb725
......@@ -10,13 +10,25 @@
(error "use metering"))
(let ((root-dir (asdf:system-source-directory '#:cl-bench)))
(defparameter *root-dir* root-dir
"Toplevel directory of the CL-BENCH system.")
(defparameter *misc-dir* (merge-pathnames "misc/" root-dir)
"Directory containing auxilliary files.")
(defparameter *output-dir* (merge-pathnames "output/" root-dir)
"Directory where the results are stored.")
;; don't use logical pathnames (not well supported on all active
;; implementations. These would be the translations if everything
;; would work as expected.
#+(or)
(setf (logical-pathname-translations "bench")
`(("root;*.*.*" ,root-dir)
("test;*.*.*" ,(merge-pathnames "files/" root-dir))
("misc;*.*.*" ,(merge-pathnames "misc/" root-dir))
("result;*.*.*" ,(merge-pathnames "output/" root-dir))
("**;*.*.*" ,(merge-pathnames "**/" root-dir))))
(ensure-directories-exist (merge-pathnames "output/" root-dir)))
("**;*.*.*" ,(merge-pathnames "**/" root-dir)))))
(ensure-directories-exist *output-dir*)
;;; This is disabled after the consultation with the ABCL maintainer
......
......@@ -292,7 +292,7 @@
(defun run-deflate-file ()
(test-deflate-file "bench:misc;message.gz"))
(test-deflate-file (merge-pathnames "message.gz" *misc-dir*)))
;; EOF
;;; misc.lisp
;;;
;;; Time-stamp: <2016-05-13 11:47:06 jack>
;;; Time-stamp: <2016-05-16 11:31:42 jack>
(defpackage :cl-bench.misc
(:use :common-lisp)
......@@ -13,14 +13,14 @@
(in-package :cl-bench.misc)
(defun run-compiler ()
(compile-file #P"bench:test;gabriel.lisp"
(compile-file (merge-pathnames "gabriel.lisp" *misc-dir*)
:print nil
#-gcl :verbose #-gcl nil))
(defun run-fasload ()
(load
(compile-file-pathname
#P"bench:test;gabriel.lisp")))
(merge-pathnames "gabriel.lisp" *misc-dir*))))
;; by Gene Luks (adapted from the Larceny benchmarks)
......
This diff is collapsed.
This diff is collapsed.
;;; report.lisp
;;
;; Author: Eric Marsden <emarsden@laas.fr>
;; Time-stamp: <2016-05-13 12:25:00 jack>
;; Time-stamp: <2016-05-16 11:36:51 jack>
;;
;;
;; When loaded into CMUCL, this should generate a report comparing the
......@@ -21,7 +21,7 @@
(defun bench-analysis ()
(let (data implementations benchmarks)
(dolist (f (directory "bench:result;CL-benchmark*.*"))
(dolist (f (directory (merge-pathnames "CL-benchmark*.*" *output-dir*)))
(ignore-errors
(with-open-file (f f :direction :input)
(let ((*read-eval* nil))
......
......@@ -3,7 +3,7 @@
;; Author: Eric Marsden <emarsden@laas.fr>
;; Maintainer: Daniel Kochmański <daniel@turtleware.eu>
;;
;; Time-stamp: <2016-05-13 19:42:30 jack>
;; Time-stamp: <2016-05-16 11:38:02 jack>
;;
;;
;; The benchmarks consist of
......@@ -123,7 +123,7 @@
(get-decoded-time)
(declare (ignore second))
(format nil "~aCL-benchmark-~d~2,'0d~2,'0dT~2,'0d~2,'0d"
"bench:result;"
(namestring *output-dir*)
year month date hour minute)))
;; grr, CLISP doesn't implement ~<..~:>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment