Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Add Clojure 1.5.0-beta1. Make ALL_BENCHMARK_CLOJURE_VERSIONS that rem…

…oves some versions that I consider too similar to nearby versions to be worth running separate benchmark tests for
  • Loading branch information...
commit 994e82e0aa4cb9f34d2fd78df43965a9e8e9dc86 1 parent 5a31869
@jafingerhut authored
View
2  binarytrees/batch.sh
@@ -11,7 +11,7 @@ BENCHMARK="binarytrees"
#ALL_LANGUAGES="java jruby clj-1.2 clj-1.3-alpha1 clj-1.3-alpha3 clj-1.3-alpha4"
# Note: Older versions than clj-1.3-alpha7 cannot compile the program
# binarytrees.clojure-rh.clojure.
-ALL_LANGUAGES="java `all_clojure_versions_except 1.2 1.2.1 1.3-alpha5 1.3-alpha6`"
+ALL_LANGUAGES="java `all_benchmark_clojure_versions_except 1.2 1.2.1 1.3-alpha5 1.3-alpha6`"
ALL_TESTS="quick medium long"
LANGUAGES=""
View
60 env.sh
@@ -35,12 +35,16 @@ fi
# to the Clojure git log, it is identical to clj-1.4-beta1. I kept
# only clj-1.4-beta1.
-ALL_CLOJURE_VERSIONS="clj-1.2 clj-1.2.1 clj-1.3-alpha5 clj-1.3-alpha6 clj-1.3-alpha7 clj-1.3-alpha8 clj-1.3-beta1 clj-1.3-beta2 clj-1.3-beta3 clj-1.3 clj-1.4-alpha1 clj-1.4-alpha2 clj-1.4-alpha3 clj-1.4-alpha4 clj-1.4-beta1 clj-1.4-beta2 clj-1.4-beta3 clj-1.4-beta4 clj-1.4-beta5 clj-1.4-beta6 clj-1.4-beta7 clj-1.4 clj-1.5-alpha1 clj-1.5-alpha2 clj-1.5-alpha3 clj-1.5-alpha4 clj-1.5-alpha5 clj-1.5-alpha6 clj-1.5-alpha7"
-ALL_MAJOR_CLOJURE_VERSIONS="clj-1.2.1 clj-1.3 clj-1.4 clj-1.5-alpha7"
+# See also below the definition of ALL_BENCHMARK_CLOJURE_VERSIONS,
+# which is a subset of ALL_CLOJURE_VERSIONS
+
+ALL_CLOJURE_VERSIONS="clj-1.2 clj-1.2.1 clj-1.3-alpha5 clj-1.3-alpha6 clj-1.3-alpha7 clj-1.3-alpha8 clj-1.3-beta1 clj-1.3-beta2 clj-1.3-beta3 clj-1.3 clj-1.4-alpha1 clj-1.4-alpha2 clj-1.4-alpha3 clj-1.4-alpha4 clj-1.4-beta1 clj-1.4-beta2 clj-1.4-beta3 clj-1.4-beta4 clj-1.4-beta5 clj-1.4-beta6 clj-1.4-beta7 clj-1.4 clj-1.5-alpha1 clj-1.5-alpha2 clj-1.5-alpha3 clj-1.5-alpha4 clj-1.5-alpha5 clj-1.5-alpha6 clj-1.5-alpha7 clj-1.5-beta1"
+
+ALL_MAJOR_CLOJURE_VERSIONS="clj-1.2.1 clj-1.3 clj-1.4 clj-1.5-beta1"
show_known_clojure_versions()
{
- 1>&2 echo -n "1.2 1.2.1 1.3-alpha[5-8] 1.3-beta[1-3] 1.3 1.4-alpha[1-5] 1.4-beta[1-7] 1.4.0 1.5-alpha[1-7]"
+ 1>&2 echo -n "1.2 1.2.1 1.3-alpha[5-8] 1.3-beta[1-3] 1.3 1.4-alpha[1-5] 1.4-beta[1-7] 1.4.0 1.5-alpha[1-7] clj-1.5-beta1"
}
internal_check_clojure_version_spec()
@@ -95,6 +99,13 @@ internal_check_clojure_version_spec()
CLJ_VERSION_STR="${spec}"
;;
+ 1.5-beta1)
+ CLJ_VERSION_STR="1.5.0${spec/1.5/}"
+ ;;
+ 1.5.0-beta1)
+ CLJ_VERSION_STR="${spec}"
+ ;;
+
*)
# Unknown Clojure version
ret_val=1
@@ -191,6 +202,49 @@ all_clojure_versions_except()
echo "${ret_val}"
}
+# ALL_BENCHMARK_CLOJURE_VERSIONS is same as ALL_CLOJURE_VERSIONS,
+# except the following versions have been removed so that benchmarking
+# runs go faster:
+
+# 1.5-alpha7 is only 1 commit newer than 1.5-alpha6, and it is the
+# addition of 5 new macros that won't be used in any benchmarks
+# spanning many versions.
+
+# 1.5-alpha6 is only 1 commit newer than 1.5-alpha5, and it is a minor
+# bug fix in column metadata.
+
+# 1.4-beta7 is only 2 commits older than 1.4.0, and they are edits to
+# doc strings.
+
+# 1.4-beta5 is only 2 commits newer than 1.4-beta4, and they are a
+# change to the data readers implementation and addition of the
+# *compiler-options* Var.
+
+# 1.4-beta3 is only 1 commit newer than 1.4-beta2, and it is the
+# option to remove metadata during compilation.
+
+ALL_BENCHMARK_CLOJURE_VERSIONS="`all_clojure_versions_except 1.4-beta3 1.4-beta5 1.4-beta7 1.5-alpha6 1.5-alpha7`"
+
+all_benchmark_clojure_versions_except()
+{
+ local clojure_versions_to_exclude_set=`make_clojure_version_set $*`
+ local tmp
+ local ret_val=""
+ for v in ${ALL_BENCHMARK_CLOJURE_VERSIONS}
+ do
+ check_clojure_version_spec "${v}"
+ tmp="${CLJ_VERSION_STR}"
+ check_exact_string_in_string_set "${tmp}" "${clojure_versions_to_exclude_set}"
+ if [ $? != 0 ]
+ then
+ # The version is not in the list of versions to exclude,
+ # so add it to return value.
+ ret_val="${ret_val} ${v}"
+ fi
+ done
+ echo "${ret_val}"
+}
+
#echo "Debug OS=:${OS}:"
if [ "$OS" == "Cygwin" ]
then
View
2  fannkuch/batch.sh
@@ -10,7 +10,7 @@ BENCHMARK="fannkuch"
# No Clojure version created yet.
#ALL_LANGUAGES="sbcl perl ghc java clj-1.2 clj-1.3-alpha1 clj-1.3-alpha3 clj-1.3-alpha4"
-ALL_LANGUAGES="java ${ALL_CLOJURE_VERSIONS}"
+ALL_LANGUAGES="java ${ALL_BENCHMARK_CLOJURE_VERSIONS}"
ALL_TESTS="quick medium long"
LANGUAGES=""
View
2  fannkuchredux/batch.sh
@@ -11,7 +11,7 @@ BENCHMARK="fannkuch-redux"
#ALL_LANGUAGES="sbcl perl ghc java clj-1.2 clj-1.3-alpha1 clj-1.3-alpha3 clj-1.3-alpha4"
#ALL_LANGUAGES="perl ghc java clj-1.2 clj-1.3-alpha1 clj-1.3-alpha3 clj-1.3-alpha4"
-ALL_LANGUAGES="java ${ALL_CLOJURE_VERSIONS}"
+ALL_LANGUAGES="java ${ALL_BENCHMARK_CLOJURE_VERSIONS}"
ALL_TESTS="quick medium long"
LANGUAGES=""
View
2  fasta/batch.sh
@@ -8,7 +8,7 @@ mkdir -p $OUTPUT_DIR
BENCHMARK="fasta"
#ALL_LANGUAGES="sbcl perl ghc java jruby clj-1.2 clj-1.3-alpha1 clj-1.3-alpha3 clj-1.3-alpha4"
-ALL_LANGUAGES="java ${ALL_CLOJURE_VERSIONS}"
+ALL_LANGUAGES="java ${ALL_BENCHMARK_CLOJURE_VERSIONS}"
ALL_TESTS="quick medium long"
LANGUAGES=""
View
4 hello/batch.sh
@@ -7,8 +7,8 @@ mkdir -p $OUTPUT_DIR
BENCHMARK="hello"
-#ALL_LANGUAGES="java jruby scala ${ALL_CLOJURE_VERSIONS}"
-ALL_LANGUAGES="java ${ALL_CLOJURE_VERSIONS}"
+#ALL_LANGUAGES="java jruby scala ${ALL_BENCHMARK_CLOJURE_VERSIONS}"
+ALL_LANGUAGES="java ${ALL_BENCHMARK_CLOJURE_VERSIONS}"
ALL_TESTS="quick medium long"
LANGUAGES=""
View
2  knucleotide/batch.sh
@@ -15,7 +15,7 @@ BENCHMARK="knucleotide"
# enough more memory than later versions with this program that the
# -Xmx command line argument currently used is not enough, and it runs
# out of memory. Leave those Clojure versions out for now.
-ALL_LANGUAGES="java `all_clojure_versions_except 1.2 1.2.1 1.3-alpha5 1.3-alpha6`"
+ALL_LANGUAGES="java `all_benchmark_clojure_versions_except 1.2 1.2.1 1.3-alpha5 1.3-alpha6`"
ALL_TESTS="quick medium long"
LANGUAGES=""
View
3  lein-files/project.clj-for-clojure-1.5.0-beta1
@@ -0,0 +1,3 @@
+(defproject clojure-1.5.0-beta1 "1.0.0-SNAPSHOT"
+ :description "FIXME: write"
+ :dependencies [[org.clojure/clojure "1.5.0-beta1"]])
View
9 lein-init.sh
@@ -103,3 +103,12 @@ do
lein deps
cd ..
done
+
+for beta in 1
+do
+ lein new clojure-1.5.0-beta${beta}
+ cd clojure-1.5.0-beta${beta}
+ cp -p "../lein-files/project.clj-for-clojure-1.5.0-beta${beta}" project.clj
+ lein deps
+ cd ..
+done
View
2  mandelbrot/batch.sh
@@ -8,7 +8,7 @@ mkdir -p $OUTPUT_DIR
BENCHMARK="mandelbrot"
#ALL_LANGUAGES="sbcl perl ghc java jruby clj-1.2 clj-1.3 clj-1.4 clj-1.5-alpha6"
-ALL_LANGUAGES="java ${ALL_CLOJURE_VERSIONS}"
+ALL_LANGUAGES="java ${ALL_BENCHMARK_CLOJURE_VERSIONS}"
ALL_TESTS="quick medium long"
LANGUAGES=""
View
2  nbody/batch.sh
@@ -12,7 +12,7 @@ BENCHMARK="nbody"
#ALL_LANGUAGES="sbcl perl ghc java clj-1.2 clj-1.3-alpha1 clj-1.3-alpha3 clj-1.3-alpha4"
#ALL_LANGUAGES="sbcl perl java clj-1.2 clj-1.3-alpha1 clj-1.3-alpha3 clj-1.3-alpha4"
-ALL_LANGUAGES="java ${ALL_CLOJURE_VERSIONS}"
+ALL_LANGUAGES="java ${ALL_BENCHMARK_CLOJURE_VERSIONS}"
ALL_TESTS="quick medium long"
LANGUAGES=""
View
2  pidigits/batch.sh
@@ -16,7 +16,7 @@ BENCHMARK="pidigits"
# when they were small enough, and then later arithmetic with those
# values can cause an exception when they overflow. It was fixed in
# clj-1.3.
-ALL_LANGUAGES="java `all_clojure_versions_except 1.3-beta2 1.3-beta3`"
+ALL_LANGUAGES="java `all_benchmark_clojure_versions_except 1.3-beta2 1.3-beta3`"
ALL_TESTS="quick medium long"
LANGUAGES=""
View
2  regexdna/batch.sh
@@ -14,7 +14,7 @@ BENCHMARK="regexdna"
# Also how to get module Text.Regex.PCRE available in GHC.
#ALL_LANGUAGES="perl java clj-1.2 clj-1.3-alpha1 clj-1.3-alpha3 clj-1.3-alpha4"
-ALL_LANGUAGES="java ${ALL_CLOJURE_VERSIONS}"
+ALL_LANGUAGES="java ${ALL_BENCHMARK_CLOJURE_VERSIONS}"
ALL_TESTS="quick long"
LANGUAGES=""
View
2  revcomp/batch.sh
@@ -23,7 +23,7 @@ BENCHMARK="revcomp"
#
# Thus I will only include Clojure versions 1.4-alpha3 and later for
# this program.
-ALL_LANGUAGES="java `all_clojure_versions_except 1.2 1.2.1 1.3-alpha5 1.3-alpha6 1.3-alpha7 1.3-alpha8 1.3-beta1 1.3-beta2 1.3-beta3 1.3 1.4-alpha1 1.4-alpha2`"
+ALL_LANGUAGES="java `all_benchmark_clojure_versions_except 1.2 1.2.1 1.3-alpha5 1.3-alpha6 1.3-alpha7 1.3-alpha8 1.3-beta1 1.3-beta2 1.3-beta3 1.3 1.4-alpha1 1.4-alpha2`"
ALL_TESTS="quick medium long"
LANGUAGES=""
View
2  spectralnorm/batch.sh
@@ -12,7 +12,7 @@ BENCHMARK="spectralnorm"
#ALL_LANGUAGES="sbcl perl ghc java clj-1.2 clj-1.3-alpha1 clj-1.3-alpha3 clj-1.3-alpha4 jruby scala"
#ALL_LANGUAGES="java clj-1.2 jruby scala"
-ALL_LANGUAGES="java ${ALL_CLOJURE_VERSIONS}"
+ALL_LANGUAGES="java ${ALL_BENCHMARK_CLOJURE_VERSIONS}"
ALL_TESTS="quick medium long"
LANGUAGES=""
Please sign in to comment.
Something went wrong with that request. Please try again.