Changeset 5275

Timestamp:

02/03/10 03:10:54 (7 months ago)

Author:

pmoura

Message:

Simplified usage of the "mtbatch" multi-threading benchmarks example by using conditional compilation directives for the Prolog-specific predicates instead of a parametric object.

Location:

trunk

Files:

• examples/threads/mtbatch/mtbatch.lgt (modified) (3 diffs)
• examples/threads/mtbatch/NOTES.txt (modified) (1 diff)
• examples/threads/mtbatch/SCRIPT.txt (modified) (1 diff)
• RELEASE_NOTES.txt (modified) (1 diff)

trunk/examples/threads/mtbatch/mtbatch.lgt

@@ -1 +1 @@
 
-:- object(mtbatch(_Prolog)).
+:- object(mtbatch).
 
     :- info([
-        version is 1.2,
+        version is 1.3,
         author is 'Paulo Moura',
-        date is 2008/08/30,
-        comment is 'Multi-threading benchmarks.',
-        parameters is ['Prolog'- 'Prolog backend compiler. Supported compilers are SWI-Prolog (swi), YAP (yap), and XSB (xsb).']]).
+        date is 2010/02/01,
+        comment is 'Multi-threading benchmarks. Supports SWI-Prolog, XSB, and YAP.']).
 
     :- threaded.
@@ -490 +489 @@
     do_benchmark(cop_overhead(_, _, _, _), _).
 
-    walltime_begin(Walltime) :-
-        parameter(1, Prolog),
-        walltime_begin(Prolog, Walltime).
-
-    walltime_begin(swi, Walltime) :-
-        get_time(Walltime).
-    walltime_begin(yap, 0.0) :-
-        statistics(walltime, _).
-    walltime_begin(xsb, Walltime) :-
-        walltime(Walltime).
-
-    walltime_end(Walltime) :-
-        parameter(1, Prolog),
-        walltime_end(Prolog, Walltime).
-
-    walltime_end(swi, Walltime) :-
-        get_time(Walltime).
-    walltime_end(yap, Walltime) :-
-        statistics(walltime, [_, Time]),
-        Walltime is Time / 1000.
-    walltime_end(xsb, Walltime) :-
-        walltime(Walltime).
+    :- if(current_logtalk_flag(prolog_dialect, swi)).
+
+        walltime_begin(Walltime) :-
+            get_time(Walltime).
+
+        walltime_end(Walltime) :-
+            get_time(Walltime).
+
+        write_average(Average) :-
+            put_char('\t'),
+            format('~4f', [Average]),
+            flush_output.
+
+    :- elif(current_logtalk_flag(prolog_dialect, yap)).
+
+        walltime_begin(0.0) :-
+            statistics(walltime, _).
+
+        walltime_end(Walltime) :-
+            statistics(walltime, [_, Time]),
+            Walltime is Time / 1000.
+
+        write_average(Average) :-
+            put_char('\t'),
+            format('~4f', [Average]),
+            flush_output.
+
+    :- elif(current_logtalk_flag(prolog_dialect, xsb)).
+
+        walltime_begin(Walltime) :-
+            walltime(Walltime).
+
+        walltime_end(xsb, Walltime) :-
+            walltime(Walltime).
+
+        write_average(Average) :-
+            put_char('\t'),
+            fmt_write("%4f", Average),
+            flush_output.
+
+    :- else.
+
+        :- initialization((
+            write('Unsupported Prolog compiler for running Logtalk multi-threading features.'),
+            halt
+        )).
+
+    :- endif.
 
     repeat(_).
@@ -519 +544 @@
         repeat(N2).
 
-    write_average(Average) :-
-        put_char('\t'),
-        parameter(1, Prolog),
-        write_average(Prolog, Average),
-        flush_output.
-
-    write_average(swi, Average) :-
-        format('~6f', [Average]).
-    write_average(yap, Average) :-
-        format('~6f', [Average]).
-    write_average(xsb, Average) :-
-        fmt_write("%6f", Average).
-
     write_error :-
         put_char('\t'),
-        write('*error!*'),
+        write('error!'),
         flush_output.
 

trunk/examples/threads/mtbatch/NOTES.txt

@@ -12 +12 @@
 To load this example and for sample queries, please see the SCRIPT.txt file.
 
-This folder provides a parametric object for running multi-threading 
-benchmarks. The object parameter must be instantiated with an atom 
-representing the back-end Prolog compiler being used:
+This folder provides an object for running multi-threading benchmarks. The
+supported back-end Prolog compilers are SWI-Prolog, YAP, and XSB.
 
-    SWI-Prolog: swi
-    YAP:        yap
-    XSB:        xsb
+For example, the following goal will run all benchmark tests:
 
-This is necessary due to the different built-in predicates used by each 
-Prolog compiler for timing statistics.
-
-For example, the following goal will run all benchmark tests (assuming 
-we're using SWI-Prolog as the back-end compiler):
-
-    | ?- mtbatch(swi)::run.
+    | ?- mtbatch::run.
 
 You may also run just a single benchmark test a given number of times.
 For example:
 
-    | ?- mtbatch(swi)::run(primes, 10).
+    | ?- mtbatch::run(primes, 10).
 
 The following tests are available:

trunk/examples/threads/mtbatch/SCRIPT.txt

@@ -16 +16 @@
 
 
-% run all tests using SWI-Prolog as the backend compiler:
+% run all tests:
 
-?- mtbatch(swi)::run.
+?- mtbatch::run.
 ...
 
 
-% run all tests using YAP as the backend compiler:
+% run all tests (average of 20 times for each test):
 
-?- mtbatch(yap)::run(20).
+?- mtbatch::run(20).
 ...
 
 
-% run the primes benchmark test using XSB as the backend compiler:
+% run the primes benchmark test (average of 10 times):
 
-?- mtbatch(xsb)::run(primes, 10).
-...
+?- mtbatch::run(primes, 10).

trunk/RELEASE_NOTES.txt

@@ -15 +15 @@
 
 2.38.3 - February ??, 2010
+
+    Simplified usage of the "mtbatch" multi-threading benchmarks example
+    by using conditional compilation directives for the Prolog-specific
+    predicates instead of a parametric object.
 
     Update the Windows installer script in order to check for the new