Commits

Shlomi Fish committed 483c79d

Merge differences.

Comments (0)

Files changed (1)

black-hole-solitaire/c-solver/Tatzer

 (
     tt => [qw(-r --notest-suite --static)],
     bench => [qw(-l tt --omit-frame)],
-    fc_bench => [qw(-l bench --fc-only)],
-    p4b => [qw(-l fc_bench --arch=pentium4)],
-    x64b => [qw(-l fc_bench --arch=barcelona)],
-    p4bb => [qw(-l bench --arch=pentium4)],
-    x64bb => [qw(-l bench --arch=barcelona)],
+    fc_bench => [qw(-l bench)],
 );
 
+foreach my $rec (
+    {id => "p4", a => "pentium4"},
+    {id => "x64", a => "barcelona"},
+    {id => "c2", a => "core2",},
+    {id => "ci7", a => "corei7-avx",}
+)
+{
+    my $id = $rec->{id};
+    my $arch = $rec->{a};
+
+    $themes{$id} = ["--arch=$arch"];
+    # Benchmark for freecell only
+    $themes{$id.'b'} = [qw(-l fc_bench -l), $id];
+    # Generalised benchmark - not freecell-only - should pass the tests.
+    $themes{$id.'bb'} = [qw(-l bench -l), $id];
+    # Memory conserving theme - for freecell only
+    $themes{$id.'m'} = [qw(-l fc_reduce_mem -l), $id];
+    # Generalised Memory conserving theme - not only for freecell
+    $themes{$id.'mm'} = [qw(-l reduce_mem -l), $id];
+    # Testing theme - aims to run the tests quickly
+    $themes{$id.'t'} = ['-l', $id.'bb', '--rwd', '--dbm=kaztree', '--test-suite',];
+
+    # For use by PySolFC
+    $themes{$id . "_pysol"} = ['-l', $id.'bb', '--num-stacks=14', "--prefix=$ENV{HOME}/apps/fcs-for-pysol",];
+}
+
 my @new_argv = @ARGV;
 
 CALC_NEW_ARGV:
     "-DDATADIR=$prefix/share",
     ((!$build_static_lib) ? ("-DBUILD_STATIC_LIBRARY=") : ()),
     (defined($pack_size) ? ("-DFCS_IA_PACK_SIZE=$pack_size") : ()),
+    ($test_suite ? ("-DFCS_WITH_TEST_SUITE=1") : ()),
     (defined($cpu_arch) ? ("-DCPU_ARCH=$cpu_arch") : ()),
     ($omit_frame ? "-DOPTIMIZATION_OMIT_FRAME_POINTER=1" : ()),
     ($state_storage_libavl2_tree