Browse Source

Added Dhrystones to aDEVS

Román Cárdenas 5 years ago
parent
commit
2720127a21

+ 7 - 2
devstone/adevs/CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.10)
 set (CMAKE_CXX_STANDARD 17)
-set (CMAKE_CXX_COMPILER "g++")
+set (CMAKE_CXX_COMPILER "gcc")
 project(devstone-adevs)
 add_compile_options(-g)
 
@@ -16,5 +16,10 @@ set(CMAKE_CXX_STANDARD 17)
 
 add_executable(DEVStone src/DEVStone.cpp src/DummyAtomic.cpp src/DEVSWrapper.cpp
         src/li.cpp src/hoMod.cpp src/hi.cpp src/hi.hpp src/ho.cpp src/seeder.cpp)
-
 target_link_libraries(DEVStone ${Boost_PROGRAM_OPTIONS_LIBRARY})
+
+#add_executable(DEVStoneParallel src/DEVStone.cpp src/DummyAtomic.cpp src/DEVSWrapper.cpp
+#        src/li.cpp src/hoMod.cpp src/hi.cpp src/hi.hpp src/ho.cpp src/seeder.cpp)
+
+#target_link_libraries(DEVStoneParallel ${Boost_PROGRAM_OPTIONS_LIBRARY})
+#set_target_properties(DEVStoneParallel PROPERTIES COMPILE_FLAGS "-fopenmp")

+ 3 - 0
devstone/adevs/src/DummyAtomic.cpp

@@ -3,6 +3,7 @@
 //
 
 #include "DummyAtomic.hpp"
+#include "../../dhry/dhry_1.c"
 
 const int DummyAtomic::in = 0;
 const int DummyAtomic::out = 1;
@@ -17,6 +18,7 @@ DummyAtomic::DummyAtomic(int intDelayIn, int extDelayIn, double procTimeIn): ade
 
 /// External transition function
 void DummyAtomic::delta_ext(double e, const adevs::Bag<IO_Type>& x) {
+    DhryStone().dhrystoneRun(extDelay);
     t += e;
     if (sigma != DBL_MAX) {
         sigma -= e;
@@ -27,6 +29,7 @@ void DummyAtomic::delta_ext(double e, const adevs::Bag<IO_Type>& x) {
 
 /// Internal transition function
 void DummyAtomic::delta_int() {
+    DhryStone().dhrystoneRun(intDelay);
     t += sigma;
     sigma = DBL_MAX;
 }

+ 1 - 1
devstone/cadmium/src/cadmium-devstone-atomic.hpp

@@ -30,7 +30,7 @@
 #include<cadmium/modeling/message_bag.hpp>
 #include<limits>
 
-#include "../dhry/dhry_1.c"
+#include "../../dhry/dhry_1.c"
 
 
 /**

+ 2 - 6
devstone/cdboost/CMakeLists.txt

@@ -16,10 +16,6 @@ find_package(Boost COMPONENTS program_options thread unit_test_framework REQUIRE
 include_directories(${Boost_INCLUDE_DIRS})
 
 ## CDBoost
-add_executable(cdboost-devstone
-        src/cdboost-devstone.cpp events_devstone.txt
-        )
-target_include_directories(cdboost-devstone
-        PUBLIC ${PROJECT_SOURCE_DIR}/simulators/cdboost/include
-        )
+add_executable(cdboost-devstone src/cdboost-devstone.cpp events_devstone.txt)
+target_include_directories(cdboost-devstone PUBLIC ${PROJECT_SOURCE_DIR}/simulators/cdboost/include)
 target_link_libraries(cdboost-devstone ${Boost_PROGRAM_OPTIONS_LIBRARY})

+ 0 - 16
devstone/cdboost/dhry/Makefile

@@ -1,16 +0,0 @@
-CC=clang
-CXX=clang++
-
-CFLAGS= -c -O0 -fPIC
-LDFLAGS+= -L/usr/local/lib
-
-DHRYSTONE=dhry_1.c dhry_2.c
-
-DHRYSTONE_OBJECTS=$(DHRYSTONE:.c=.o)
-
-all: dhrystone
-
-dhrystone: $(DHRYSTONE_OBJECTS)
-
-clean:
-	rm *.o

+ 0 - 453
devstone/cdboost/dhry/dhry.h

@@ -1,453 +0,0 @@
-#ifndef DHRY_H
-#define DHRY_H
-/*
- ****************************************************************************
- *
- *                   "DHRYSTONE" Benchmark Program
- *                   -----------------------------
- *                                                                            
- *  Version:    C, Version 2.1
- *                                                                            
- *  File:       dhry.h (part 1 of 3)
- *
- *  Date:       May 25, 1988
- *
- *  Author:     Reinhold P. Weicker
- *                      Siemens AG, AUT E 51
- *                      Postfach 3220
- *                      8520 Erlangen
- *                      Germany (West)
- *                              Phone:  [+49]-9131-7-20330
- *                                      (8-17 Central European Time)
- *                              Usenet: ..!mcsun!unido!estevax!weicker
- *
- *              converted to ANSI C by Jeremy Johnson.  1/20/00
- *
- *              Original Version (in Ada) published in
- *              "Communications of the ACM" vol. 27., no. 10 (Oct. 1984),
- *              pp. 1013 - 1030, together with the statistics
- *              on which the distribution of statements etc. is based.
- *
- *              In this C version, the following C library functions are used:
- *              - strcpy, strcmp (inside the measurement loop)
- *              - printf, scanf (outside the measurement loop)
- *              In addition, Berkeley UNIX system calls "times ()" or "time ()"
- *              are used for execution time measurement. For measurements
- *              on other systems, these calls have to be changed.
- *
- *  Collection of Results:
- *              Reinhold Weicker (address see above) and
- *              
- *              Rick Richardson
- *              PC Research. Inc.
- *              94 Apple Orchard Drive
- *              Tinton Falls, NJ 07724
- *                      Phone:  (201) 389-8963 (9-17 EST)               
- *                      Usenet: ...!uunet!pcrat!rick
- *
- *      Please send results to Rick Richardson and/or Reinhold Weicker.
- *      Complete information should be given on hardware and software used.
- *      Hardware information includes: Machine type, CPU, type and size
- *      of caches; for microprocessors: clock frequency, memory speed
- *      (number of wait states).
- *      Software information includes: Compiler (and runtime library)
- *      manufacturer and version, compilation switches, OS version.
- *      The Operating System version may give an indication about the
- *      compiler; Dhrystone itself performs no OS calls in the measurement loop.
- *
- *      The complete output generated by the program should be mailed
- *      such that at least some checks for correctness can be made.
- *
- ***************************************************************************
- *
- *  History:    This version C/2.1 has been made for two reasons:
- *
- *              1) There is an obvious need for a common C version of
- *              Dhrystone, since C is at present the most popular system
- *              programming language for the class of processors
- *              (microcomputers, minicomputers) where Dhrystone is used most.
- *              There should be, as far as possible, only one C version of
- *              Dhrystone such that results can be compared without
- *              restrictions. In the past, the C versions distributed
- *              by Rick Richardson (Version 1.1) and by Reinhold Weicker
- *              had small (though not significant) differences.
- *
- *              2) As far as it is possible without changes to the Dhrystone
- *              statistics, optimizing compilers should be prevented from
- *              removing significant statements.
- *
- *              This C version has been developed in cooperation with
- *              Rick Richardson (Tinton Falls, NJ), it incorporates many
- *              ideas from the "Version 1.1" distributed previously by
- *              him over the UNIX network Usenet.
- *              I also thank Chaim Benedelac (National Semiconductor),
- *              David Ditzel (SUN), Earl Killian and John Mashey (MIPS),
- *              Alan Smith and Rafael Saavedra-Barrera (UC at Berkeley)
- *              for their help with comments on earlier versions of the
- *              benchmark.
- *
- *  Changes:    In the initialization part, this version follows mostly
- *              Rick Richardson's version distributed via Usenet, not the
- *              version distributed earlier via floppy disk by Reinhold Weicker.
- *              As a concession to older compilers, names have been made
- *              unique within the first 8 characters.
- *              Inside the measurement loop, this version follows the
- *              version previously distributed by Reinhold Weicker.
- *
- *              At several places in the benchmark, code has been added,
- *              but within the measurement loop only in branches that 
- *              are not executed. The intention is that optimizing compilers
- *              should be prevented from moving code out of the measurement
- *              loop, or from removing code altogether. Since the statements
- *              that are executed within the measurement loop have NOT been
- *              changed, the numbers defining the "Dhrystone distribution"
- *              (distribution of statements, operand types and locality)
- *              still hold. Except for sophisticated optimizing compilers,
- *              execution times for this version should be the same as
- *              for previous versions.
- *              
- *              Since it has proven difficult to subtract the time for the
- *              measurement loop overhead in a correct way, the loop check
- *              has been made a part of the benchmark. This does have
- *              an impact - though a very minor one - on the distribution
- *              statistics which have been updated for this version.
- *
- *              All changes within the measurement loop are described
- *              and discussed in the companion paper "Rationale for
- *              Dhrystone version 2".
- *
- *              Because of the self-imposed limitation that the order and
- *              distribution of the executed statements should not be
- *              changed, there are still cases where optimizing compilers
- *              may not generate code for some statements. To a certain
- *              degree, this is unavoidable for small synthetic benchmarks.
- *              Users of the benchmark are advised to check code listings
- *              whether code is generated for all statements of Dhrystone.
- *
- *              Version 2.1 is identical to version 2.0 distributed via
- *              the UNIX network Usenet in March 1988 except that it corrects
- *              some minor deficiencies that were found by users of version 2.0.
- *              The only change within the measurement loop is that a
- *              non-executed "else" part was added to the "if" statement in
- *              Func_3, and a non-executed "else" part removed from Proc_3.
- *
- ***************************************************************************
- *
- * Defines:     The following "Defines" are possible:
- *              -DREG=register          (default: Not defined)
- *                      As an approximation to what an average C programmer
- *                      might do, the "register" storage class is applied
- *                      (if enabled by -DREG=register)
- *                      - for local variables, if they are used (dynamically)
- *                        five or more times
- *                      - for parameters if they are used (dynamically)
- *                        six or more times
- *                      Note that an optimal "register" strategy is
- *                      compiler-dependent, and that "register" declarations
- *                      do not necessarily lead to faster execution.
- *              -DNOSTRUCTASSIGN        (default: Not defined)
- *                      Define if the C compiler does not support
- *                      assignment of structures.
- *              -DNOENUMS               (default: Not defined)
- *                      Define if the C compiler does not support
- *                      enumeration types.
- *              -DTIMES                 (default)
- *              -DTIME
- *                      The "times" function of UNIX (returning process times)
- *                      or the "time" function (returning wallclock time)
- *                      is used for measurement. 
- *                      For single user machines, "time ()" is adequate. For
- *                      multi-user machines where you cannot get single-user
- *                      access, use the "times ()" function. If you have
- *                      neither, use a stopwatch in the dead of night.
- *                      "printf"s are provided marking the points "Start Timer"
- *                      and "Stop Timer". DO NOT use the UNIX "time(1)"
- *                      command, as this will measure the total time to
- *                      run this program, which will (erroneously) include
- *                      the time to allocate storage (malloc) and to perform
- *                      the initialization.
- *              -DHZ=nnn
- *                      In Berkeley UNIX, the function "times" returns process
- *                      time in 1/HZ seconds, with HZ = 60 for most systems.
- *                      CHECK YOUR SYSTEM DESCRIPTION BEFORE YOU JUST APPLY
- *                      A VALUE.
- *
- ***************************************************************************
- *
- *  Compilation model and measurement (IMPORTANT):
- *
- *  This C version of Dhrystone consists of three files:
- *  - dhry.h (this file, containing global definitions and comments)
- *  - dhry_1.c (containing the code corresponding to Ada package Pack_1)
- *  - dhry_2.c (containing the code corresponding to Ada package Pack_2)
- *
- *  The following "ground rules" apply for measurements:
- *  - Separate compilation
- *  - No procedure merging
- *  - Otherwise, compiler optimizations are allowed but should be indicated
- *  - Default results are those without register declarations
- *  See the companion paper "Rationale for Dhrystone Version 2" for a more
- *  detailed discussion of these ground rules.
- *
- *  For 16-Bit processors (e.g. 80186, 80286), times for all compilation
- *  models ("small", "medium", "large" etc.) should be given if possible,
- *  together with a definition of these models for the compiler system used.
- *
- **************************************************************************
- *
- *  Dhrystone (C version) statistics:
- *
- *  [Comment from the first distribution, updated for version 2.
- *   Note that because of language differences, the numbers are slightly
- *   different from the Ada version.]
- *
- *  The following program contains statements of a high level programming
- *  language (here: C) in a distribution considered representative:           
- *
- *    assignments                  52 (51.0 %)
- *    control statements           33 (32.4 %)
- *    procedure, function calls    17 (16.7 %)
- *
- *  103 statements are dynamically executed. The program is balanced with
- *  respect to the three aspects:                                             
- *
- *    - statement type
- *    - operand type
- *    - operand locality
- *         operand global, local, parameter, or constant.                     
- *
- *  The combination of these three aspects is balanced only approximately.    
- *
- *  1. Statement Type:                                                        
- *  -----------------             number
- *
- *     V1 = V2                     9
- *       (incl. V1 = F(..)
- *     V = Constant               12
- *     Assignment,                 7
- *       with array element
- *     Assignment,                 6
- *       with record component
- *                                --
- *                                34       34
- *
- *     X = Y +|-|"&&"|"|" Z        5
- *     X = Y +|-|"==" Constant     6
- *     X = X +|- 1                 3
- *     X = Y *|/ Z                 2
- *     X = Expression,             1
- *           two operators
- *     X = Expression,             1
- *           three operators
- *                                --
- *                                18       18
- *
- *     if ....                    14
- *       with "else"      7
- *       without "else"   7
- *           executed        3
- *           not executed    4
- *     for ...                     7  |  counted every time
- *     while ...                   4  |  the loop condition
- *     do ... while                1  |  is evaluated
- *     switch ...                  1
- *     break                       1
- *     declaration with            1
- *       initialization
- *                                --
- *                                34       34
- *
- *     P (...)  procedure call    11
- *       user procedure      10
- *       library procedure    1
- *     X = F (...)
- *             function  call      6
- *       user function        5                                         
- *       library function     1                                               
- *                                --                                          
- *                                17       17
- *                                        ---
- *                                        103
- *
- *    The average number of parameters in procedure or function calls
- *    is 1.82 (not counting the function values as implicit parameters).
- *
- *
- *  2. Operators
- *  ------------
- *                          number    approximate
- *                                    percentage
- *
- *    Arithmetic             32          50.8                                 
- *
- *       +                     21          33.3                              
- *       -                      7          11.1                              
- *       *                      3           4.8
- *       / (int div)            1           1.6
- *
- *    Comparison             27           42.8
- *
- *       ==                     9           14.3
- *       /=                     4            6.3
- *       >                      1            1.6
- *       <                      3            4.8
- *       >=                     1            1.6
- *       <=                     9           14.3
- *
- *    Logic                   4            6.3
- *
- *       && (AND-THEN)          1            1.6
- *       |  (OR)                1            1.6
- *       !  (NOT)               2            3.2
- * 
- *                           --          -----
- *                           63          100.1
- *
- *
- *  3. Operand Type (counted once per operand reference):
- *  ---------------
- *                          number    approximate
- *                                    percentage
- *
- *     Integer               175        72.3 %
- *     Character              45        18.6 %
- *     Pointer                12         5.0 %
- *     String30                6         2.5 %
- *     Array                   2         0.8 %
- *     Record                  2         0.8 %
- *                           ---       -------
- *                           242       100.0 %
- *
- *  When there is an access path leading to the final operand (e.g. a record
- *  component), only the final data type on the access path is counted.       
- *
- *
- *  4. Operand Locality:                                                      
- *  -------------------
- *                                number    approximate
- *                                          percentage
- *
- *     local variable              114        47.1 %
- *     global variable              22         9.1 %
- *     parameter                    45        18.6 %
- *        value                        23         9.5 %
- *        reference                    22         9.1 %
- *     function result               6         2.5 %
- *     constant                     55        22.7 %
- *                                 ---       -------
- *                                 242       100.0 %
- *
- *
- *  The program does not compute anything meaningful, but it is syntactically
- *  and semantically correct. All variables have a value assigned to them
- *  before they are used as a source operand.
- *
- *  There has been no explicit effort to account for the effects of a
- *  cache, or to balance the use of long or short displacements for code or
- *  data.
- *
- ***************************************************************************
- */
-
-/* Compiler and system dependent definitions: */
-
-#define CLOCK
-
-#ifdef CLOCK
-#include <time.h>
-#endif
-/*
-#ifndef TIME
-#define TIMES
-#endif
-*/
-                /* Use times(2) time function unless    */
-                /* explicitly defined otherwise         */
-
-#ifdef TIMES
-#include <sys/types.h>
-#include <sys/times.h>
-#endif	        /* for "times" */
-
-#define Mic_secs_Per_Second     1000000.0
-                /* Berkeley UNIX C returns process times in seconds/HZ */
-
-#ifdef  NOSTRUCTASSIGN
-#define structassign(d, s)      memcpy(&(d), &(s), sizeof(d))
-#else
-#define structassign(d, s)      d = s
-#endif
-
-#ifdef  NOENUM
-#define Ident_1 0
-#define Ident_2 1
-#define Ident_3 2
-#define Ident_4 3
-#define Ident_5 4
-  typedef int   Enumeration;
-#else
-  typedef enum  {Ident_1, Ident_2, Ident_3, Ident_4, Ident_5}
-  				Enumeration;
-#endif
-        /* for boolean and enumeration types in Ada, Pascal */
-
-/* General definitions: */
-
-#include <stdio.h>
-/* Added by JRJ. for strcpy and strcmp. */
-#include <string.h>
-/* Added by JRJ for malloc. */
-#include <stdlib.h>
-//#include <cmalloc.h>
-
-#define Null 0 
-                /* Value of a Null pointer */
-#define true  1
-#define false 0
-
-typedef int     One_Thirty;
-typedef int     One_Fifty;
-typedef char    Capital_Letter;
-typedef int     Boolean;
-typedef char    Str_30 [31];
-typedef int     Arr_1_Dim [50];
-typedef int     Arr_2_Dim [50] [50];
-
-typedef struct record 
-    {
-    struct record *Ptr_Comp;
-    Enumeration    Discr;
-    union {
-          struct {
-                  Enumeration Enum_Comp;
-                  int         Int_Comp;
-                  char        Str_Comp [31];
-                  } var_1;
-          struct {
-                  Enumeration E_Comp_2;
-                  char        Str_2_Comp [31];
-                  } var_2;
-          struct {
-                  char        Ch_1_Comp;
-                  char        Ch_2_Comp;
-                  } var_3;
-          } variant;
-      } Rec_Type, *Rec_Pointer;
-
-
-extern void Proc_1 (Rec_Pointer Ptr_Val_Par);
-extern void Proc_2 (One_Fifty *Int_Par_Ref);
-extern void Proc_3 (Rec_Pointer *Ptr_Ref_Par);
-extern void Proc_4 (void);
-extern void Proc_5 (void);
-extern void Proc_6 (Enumeration Enum_Val_Par, Enumeration *Enum_Ref_Par);
-extern void Proc_7 (One_Fifty Int_1_Par_Val, One_Fifty Int_2_Par_Val, One_Fifty *Int_Par_Ref);
-extern void Proc_8 (Arr_1_Dim Arr_1_Par_Ref, Arr_2_Dim Arr_2_Par_Ref, int Int_1_Par_Val, int Int_2_Par_Val);
-
-extern Enumeration Func_1 (Capital_Letter Ch_1_Par_Val, Capital_Letter Ch_2_Par_Val);
-extern Boolean Func_2 (Str_30 Str_1_Par_Ref, Str_30 Str_2_Par_Ref);
-extern Boolean Func_3 (Enumeration Enum_Par_Val);
-
-int dhrystoneRun (int Number_Of_Runs);
-
-#endif // DHRY_H

+ 0 - 440
devstone/cdboost/dhry/dhry_1.c

@@ -1,440 +0,0 @@
-/*
-
- ****************************************************************************
- *
- *                   "DHRYSTONE" Benchmark Program
- *                   -----------------------------
- *                                                                            
- *  Version:    C, Version 2.1
- *                                                                            
- *  File:       dhry_1.c (part 2 of 3)
- *
- *  Date:       May 25, 1988
- *
- *  Author:     Reinhold P. Weicker
- *              converted to ANSI C by Jeremy Johnson.  1/20/00
- *
- ****************************************************************************
- */
-#ifndef DHRY1_C
-#define DHRY1_C
-
-
-#include "dhry.h"
-#include "dhry_2.c"
-
-/* Global Variables: */
-int             Int_Glob;
-char            Ch_1_Glob;
-
-
-class DhryStone {
-
-    public:
-        Rec_Pointer     Ptr_Glob,
-                        Next_Ptr_Glob;
-        Boolean         Bool_Glob;
-        char            Ch_2_Glob;
-        int             Arr_1_Glob [50];
-        int             Arr_2_Glob [50] [50];
-        long            Begin_Time,
-                        End_Time,
-                        User_Time;
-        float           Microseconds,
-                        Dhrystones_Per_Second;
-
-        /* Added to dhry.h.  JRJ. */
-        /* extern char     *malloc (); */
-
-        /* Enumeration     Func_1 (); */
-        /* forward declaration necessary since Enumeration may not simply be int */
-
-        #ifndef REG
-            Boolean Reg = false;
-        #define REG
-                /* REG becomes defined as empty */
-                /* i.e. no register variables   */
-        #else
-        //        Boolean Reg = true;
-        #endif
-
-        /* variables for time measurement: */
-
-        #ifdef TIMES
-            struct tms      time_info;
-        extern  int     times ();
-                        /* see library function "times" */
-        //#define Too_Small_Time 120
-        #define Too_Small_Time 1
-                        /* RTDEVS MODIFICATIONS -
-                        Before : Measurements should last at least about 2 seconds
-                        Now    : It can last as little as I want */
-        #endif
-        #ifdef TIME
-            extern long     time();
-                        /* see library function "time"  */
-
-        //#define Too_Small_Time 120
-        #define Too_Small_Time 1
-                        /* RTDEVS MODIFICATIONS -
-                        Before : Measurements should last at least about 2 seconds
-                        Now    : It can last as little as I want */
-        #endif
-
-        #ifdef CLOCK
-        // #define Too_Small_Time 2 * CLOCKS_PER_SEC
-        #define Too_Small_Time 1
-            /* RTDEVS MODIFICATIONS -
-            Before : Measurements should last at least about 2 seconds
-            Now    : It can last as little as I want */
-        #endif
-
-
-        int dhrystoneRun (int parameterNofRuns)
-    /*****/
-
-        /* main program, corresponds to procedures        */
-        /* Main and Proc_0 in the Ada version             */
-        {
-          One_Fifty       Int_1_Loc;
-          REG   One_Fifty       Int_2_Loc=0;
-          One_Fifty       Int_3_Loc;
-          REG   char            Ch_Index;
-          Enumeration     Enum_Loc;
-          Str_30          Str_1_Loc;
-          Str_30          Str_2_Loc;
-          REG   int             Run_Index;
-          REG   int             Number_Of_Runs;
-
-          /* Initializations */
-
-          Next_Ptr_Glob = (Rec_Pointer) malloc (sizeof (Rec_Type));
-          Ptr_Glob = (Rec_Pointer) malloc (sizeof (Rec_Type));
-
-          Ptr_Glob->Ptr_Comp                    = Next_Ptr_Glob;
-          Ptr_Glob->Discr                       = Ident_1;
-          Ptr_Glob->variant.var_1.Enum_Comp     = Ident_3;
-          Ptr_Glob->variant.var_1.Int_Comp      = 40;
-          strcpy (Ptr_Glob->variant.var_1.Str_Comp,
-                  "DHRYSTONE PROGRAM, SOME STRING");
-          strcpy (Str_1_Loc, "DHRYSTONE PROGRAM, 1'ST STRING");
-
-          Arr_2_Glob [8][7] = 10;
-          /* Was missing in published program. Without this statement,    */
-          /* Arr_2_Glob [8][7] would have an undefined value.             */
-          /* Warning: With 16-Bit processors and Number_Of_Runs > 32000,  */
-          /* overflow may occur for this array element.                   */
-
-    /*  printf ("\n");
-      printf ("Dhrystone Benchmark, Version 2.1 (Language: C)\n");
-      printf ("\n");
-    */
-          if (true)
-          {
-    /*    printf ("Program compiled with 'register' attribute\n");
-        printf ("\n");
-    */
-          }
-          else
-          {
-    /*    printf ("Program compiled without 'register' attribute\n");
-        printf ("\n");
-    */
-          }
-    //  printf ("Please give the number of runs through the benchmark: ");
-          {
-            int n;
-    //    scanf ("%d", &n);
-    //    Number_Of_Runs = n;
-            Number_Of_Runs = parameterNofRuns;
-          }
-    /*  printf ("\n");
-
-      printf ("Execution starts, %d runs through Dhrystone\n", Number_Of_Runs);
-    */
-          /***************/
-          /* Start timer */
-          /***************/
-
-    #ifdef TIMES
-          times (&time_info);
-      Begin_Time = (long) time_info.tms_utime;
-    #endif
-    #ifdef TIME
-          Begin_Time = time ( (long *) 0);
-    #endif
-
-    #ifdef CLOCK
-          Begin_Time = (long) clock();
-    #endif
-
-          for (Run_Index = 1; Run_Index <= Number_Of_Runs; ++Run_Index)
-          {
-
-            Proc_5();
-            Proc_4();
-            /* Ch_1_Glob == 'A', Ch_2_Glob == 'B', Bool_Glob == true */
-            Int_1_Loc = 2;
-            Int_2_Loc = 3;
-            strcpy (Str_2_Loc, "DHRYSTONE PROGRAM, 2'ND STRING");
-            Enum_Loc = Ident_2;
-            Bool_Glob = ! Func_2 (Str_1_Loc, Str_2_Loc);
-            /* Bool_Glob == 1 */
-            while (Int_1_Loc < Int_2_Loc)  /* loop body executed once */
-            {
-              Int_3_Loc = 5 * Int_1_Loc - Int_2_Loc;
-              /* Int_3_Loc == 7 */
-              Proc_7 (Int_1_Loc, Int_2_Loc, &Int_3_Loc);
-              /* Int_3_Loc == 7 */
-              Int_1_Loc += 1;
-            } /* while */
-            /* Int_1_Loc == 3, Int_2_Loc == 3, Int_3_Loc == 7 */
-            Proc_8 (Arr_1_Glob, Arr_2_Glob, Int_1_Loc, Int_3_Loc);
-            /* Int_Glob == 5 */
-            Proc_1 (Ptr_Glob);
-            for (Ch_Index = 'A'; Ch_Index <= Ch_2_Glob; ++Ch_Index)
-              /* loop body executed twice */
-            {
-              if (Enum_Loc == Func_1 (Ch_Index, 'C'))
-                /* then, not executed */
-              {
-                Proc_6 (Ident_1, &Enum_Loc);
-                strcpy (Str_2_Loc, "DHRYSTONE PROGRAM, 3'RD STRING");
-                Int_2_Loc = Run_Index;
-                Int_Glob = Run_Index;
-              }
-            }
-            /* Int_1_Loc == 3, Int_2_Loc == 3, Int_3_Loc == 7 */
-            Int_2_Loc = Int_2_Loc * Int_1_Loc;
-            Int_1_Loc = Int_2_Loc / Int_3_Loc;
-            Int_2_Loc = 7 * (Int_2_Loc - Int_3_Loc) - Int_1_Loc;
-            /* Int_1_Loc == 1, Int_2_Loc == 13, Int_3_Loc == 7 */
-            Proc_2 (&Int_1_Loc);
-            /* Int_1_Loc == 5 */
-
-          } /* loop "for Run_Index" */
-
-          /**************/
-          /* Stop timer */
-          /**************/
-
-    #ifdef TIMES
-          times (&time_info);
-      End_Time = (long) time_info.tms_utime;
-    #endif
-    #ifdef TIME
-          End_Time = time ( (long *) 0);
-    #endif
-
-    #ifdef CLOCK
-          End_Time = (long) clock();
-    #endif
-
-    /*
-      printf ("Execution ends\n");
-      printf ("\n");
-      printf ("Final values of the variables used in the benchmark:\n");
-      printf ("\n");
-      printf ("Int_Glob:            %d\n", Int_Glob);
-      printf ("        should be:   %d\n", 5);
-      printf ("Bool_Glob:           %d\n", Bool_Glob);
-      printf ("        should be:   %d\n", 1);
-      printf ("Ch_1_Glob:           %c\n", Ch_1_Glob);
-      printf ("        should be:   %c\n", 'A');
-      printf ("Ch_2_Glob:           %c\n", Ch_2_Glob);
-      printf ("        should be:   %c\n", 'B');
-      printf ("Arr_1_Glob[8]:       %d\n", Arr_1_Glob[8]);
-      printf ("        should be:   %d\n", 7);
-      printf ("Arr_2_Glob[8][7]:    %d\n", Arr_2_Glob[8][7]);
-      printf ("        should be:   Number_Of_Runs + 10\n");
-      printf ("Ptr_Glob->\n");
-      printf ("  Ptr_Comp:          %d\n", (int) Ptr_Glob->Ptr_Comp);
-      printf ("        should be:   (implementation-dependent)\n");
-      printf ("  Discr:             %d\n", Ptr_Glob->Discr);
-      printf ("        should be:   %d\n", 0);
-      printf ("  Enum_Comp:         %d\n", Ptr_Glob->variant.var_1.Enum_Comp);
-      printf ("        should be:   %d\n", 2);
-      printf ("  Int_Comp:          %d\n", Ptr_Glob->variant.var_1.Int_Comp);
-      printf ("        should be:   %d\n", 17);
-      printf ("  Str_Comp:          %s\n", Ptr_Glob->variant.var_1.Str_Comp);
-      printf ("        should be:   DHRYSTONE PROGRAM, SOME STRING\n");
-      printf ("Next_Ptr_Glob->\n");
-      printf ("  Ptr_Comp:          %d\n", (int) Next_Ptr_Glob->Ptr_Comp);
-      printf ("        should be:   (implementation-dependent), same as above\n");
-      printf ("  Discr:             %d\n", Next_Ptr_Glob->Discr);
-      printf ("        should be:   %d\n", 0);
-      printf ("  Enum_Comp:         %d\n", Next_Ptr_Glob->variant.var_1.Enum_Comp);
-      printf ("        should be:   %d\n", 1);
-      printf ("  Int_Comp:          %d\n", Next_Ptr_Glob->variant.var_1.Int_Comp);
-      printf ("        should be:   %d\n", 18);
-      printf ("  Str_Comp:          %s\n",
-                                    Next_Ptr_Glob->variant.var_1.Str_Comp);
-      printf ("        should be:   DHRYSTONE PROGRAM, SOME STRING\n");
-      printf ("Int_1_Loc:           %d\n", Int_1_Loc);
-      printf ("        should be:   %d\n", 5);
-      printf ("Int_2_Loc:           %d\n", Int_2_Loc);
-      printf ("        should be:   %d\n", 13);
-      printf ("Int_3_Loc:           %d\n", Int_3_Loc);
-      printf ("        should be:   %d\n", 7);
-      printf ("Enum_Loc:            %d\n", Enum_Loc);
-      printf ("        should be:   %d\n", 1);
-      printf ("Str_1_Loc:           %s\n", Str_1_Loc);
-      printf ("        should be:   DHRYSTONE PROGRAM, 1'ST STRING\n");
-      printf ("Str_2_Loc:           %s\n", Str_2_Loc);
-      printf ("        should be:   DHRYSTONE PROGRAM, 2'ND STRING\n");
-      printf ("\n");
-    */
-          User_Time = End_Time - Begin_Time;
-
-          if (User_Time < Too_Small_Time)
-          {
-    /*    printf ("Measured time too small to obtain meaningful results\n");
-        printf ("Please increase number of runs\n");
-        printf ("\n");
-    */
-          }
-          else
-          {
-    #ifdef TIME
-            Microseconds = (float) User_Time * Mic_secs_Per_Second
-                            / (float) Number_Of_Runs;
-        Dhrystones_Per_Second = (float) Number_Of_Runs / (float) User_Time;
-    #endif
-    #ifdef TIMES
-            Microseconds = (float) User_Time * Mic_secs_Per_Second
-                            / ((float) HZ * ((float) Number_Of_Runs));
-        Dhrystones_Per_Second = ((float) HZ * (float) Number_Of_Runs)
-                            / (float) User_Time;
-    #endif
-    #ifdef CLOCK
-            Microseconds =
-                    ((float) User_Time)/((float) CLOCKS_PER_SEC) * Mic_secs_Per_Second
-                    / (float) Number_Of_Runs;
-            Dhrystones_Per_Second =
-                    (float) Number_Of_Runs / (((float) User_Time)/((float) CLOCKS_PER_SEC));
-    #endif
-
-    /*    printf ("Microseconds for one run through Dhrystone: ");
-        printf ("%6.1f \n", Microseconds);
-        printf ("Dhrystones per Second:                      ");
-        printf ("%6.1f \n", Dhrystones_Per_Second);
-        printf ("\n");
-    */
-          }
-          return 0;
-        }
-
-
-        void Proc_1 (Rec_Pointer Ptr_Val_Par)
-    /* Converted to ANSI style declaration. JRJ */
-    /******************/
-
-    /* REG Rec_Pointer Ptr_Val_Par;  */
-        /* executed once */
-        {
-          REG Rec_Pointer Next_Record = Ptr_Val_Par->Ptr_Comp;
-          /* == Ptr_Glob_Next */
-          /* Local variable, initialized with Ptr_Val_Par->Ptr_Comp,    */
-          /* corresponds to "rename" in Ada, "with" in Pascal           */
-
-          structassign (*Ptr_Val_Par->Ptr_Comp, *Ptr_Glob);
-          Ptr_Val_Par->variant.var_1.Int_Comp = 5;
-          Next_Record->variant.var_1.Int_Comp
-                  = Ptr_Val_Par->variant.var_1.Int_Comp;
-          Next_Record->Ptr_Comp = Ptr_Val_Par->Ptr_Comp;
-          Proc_3 (&Next_Record->Ptr_Comp);
-          /* Ptr_Val_Par->Ptr_Comp->Ptr_Comp
-                              == Ptr_Glob->Ptr_Comp */
-          if (Next_Record->Discr == Ident_1)
-            /* then, executed */
-          {
-            Next_Record->variant.var_1.Int_Comp = 6;
-            Proc_6 (Ptr_Val_Par->variant.var_1.Enum_Comp,
-                    &Next_Record->variant.var_1.Enum_Comp);
-            Next_Record->Ptr_Comp = Ptr_Glob->Ptr_Comp;
-            Proc_7 (Next_Record->variant.var_1.Int_Comp, 10,
-                    &Next_Record->variant.var_1.Int_Comp);
-          }
-          else /* not executed */
-            structassign (*Ptr_Val_Par, *Ptr_Val_Par->Ptr_Comp);
-        } /* Proc_1 */
-
-
-        void Proc_2 (One_Fifty *Int_Par_Ref)
-    /* Converted to ANSI style declaration. JRJ */
-    /******************/
-        /* executed once */
-        /* *Int_Par_Ref == 1, becomes 4 */
-
-    /* One_Fifty   *Int_Par_Ref; */
-        {
-          One_Fifty  Int_Loc;
-          Enumeration   Enum_Loc = Ident_1;
-
-          Int_Loc = *Int_Par_Ref + 10;
-          do /* executed once */
-            if (Ch_1_Glob == 'A')
-              /* then, executed */
-            {
-              Int_Loc -= 1;
-              *Int_Par_Ref = Int_Loc - Int_Glob;
-              Enum_Loc = Ident_1;
-            } /* if */
-          while (Enum_Loc != Ident_1); /* true */
-        } /* Proc_2 */
-
-
-        void Proc_3 (Rec_Pointer *Ptr_Ref_Par)
-    /* Converted to ANSI style declaration. JRJ */
-    /******************/
-        /* executed once */
-        /* Ptr_Ref_Par becomes Ptr_Glob */
-
-    /* Rec_Pointer *Ptr_Ref_Par; */
-
-        {
-          if (Ptr_Glob != Null)
-            /* then, executed */
-            *Ptr_Ref_Par = Ptr_Glob->Ptr_Comp;
-          Proc_7 (10, Int_Glob, &Ptr_Glob->variant.var_1.Int_Comp);
-        } /* Proc_3 */
-
-
-        void Proc_4 (void) /* without parameters */
-    /* Converted to ANSI style declaration. JRJ */
-    /*******/
-        /* executed once */
-        {
-          Boolean Bool_Loc;
-
-          Bool_Loc = Ch_1_Glob == 'A';
-          Bool_Glob = Bool_Loc | Bool_Glob;
-          Ch_2_Glob = 'B';
-        } /* Proc_4 */
-
-
-        void Proc_5 (void)
-    /* Converted to ANSI style declaration. JRJ */
-    /*******/
-        /* executed once */
-        {
-          Ch_1_Glob = 'A';
-          Bool_Glob = false;
-        } /* Proc_5 */
-
-
-        /* Procedure for the assignment of structures,          */
-        /* if the C compiler doesn't support this feature       */
-    #ifdef  NOSTRUCTASSIGN
-        memcpy (d, s, l)
-    register char   *d;
-    register char   *s;
-    register int    l;
-    {
-            while (l--) *d++ = *s++;
-    }
-    #endif
-};
-
-
-#endif

+ 0 - 209
devstone/cdboost/dhry/dhry_2.c

@@ -1,209 +0,0 @@
-/*
- ****************************************************************************
- *
- *                   "DHRYSTONE" Benchmark Program
- *                   -----------------------------
- *                                                                            
- *  Version:    C, Version 2.1
- *                                                                            
- *  File:       dhry_2.c (part 3 of 3)
- *
- *  Date:       May 25, 1988
- *
- *  Author:     Reinhold P. Weicker
- *              converted to ANSI C by Jeremy Johnson.  1/20/00
- *
- ****************************************************************************
- */
-
-#include "dhry.h"
-
-#ifndef REG
-#define REG
-        /* REG becomes defined as empty */
-        /* i.e. no register variables   */
-#endif
-
-extern  int     Int_Glob;
-extern  char    Ch_1_Glob;
-
-
-void Proc_6 (Enumeration Enum_Val_Par, Enumeration *Enum_Ref_Par)
-/* Converted to ANSI style declaration. JRJ */
-/*********************************/
-    /* executed once */
-    /* Enum_Val_Par == Ident_3, Enum_Ref_Par becomes Ident_2 */
-
-/*
-Enumeration  Enum_Val_Par;
-Enumeration *Enum_Ref_Par;
-*/
-{
-  *Enum_Ref_Par = Enum_Val_Par;
-  if (! Func_3 (Enum_Val_Par))
-    /* then, not executed */
-    *Enum_Ref_Par = Ident_4;
-  switch (Enum_Val_Par)
-  {
-    case Ident_1: 
-      *Enum_Ref_Par = Ident_1;
-      break;
-    case Ident_2: 
-      if (Int_Glob > 100)
-        /* then */
-      *Enum_Ref_Par = Ident_1;
-      else *Enum_Ref_Par = Ident_4;
-      break;
-    case Ident_3: /* executed */
-      *Enum_Ref_Par = Ident_2;
-      break;
-    case Ident_4: break;
-    case Ident_5: 
-      *Enum_Ref_Par = Ident_3;
-      break;
-  } /* switch */
-} /* Proc_6 */
-
-
-void Proc_7 (One_Fifty Int_1_Par_Val, One_Fifty Int_2_Par_Val, One_Fifty *Int_Par_Ref)
-/* Converted to ANSI style declaration. JRJ */
-/**********************************************/
-    /* executed three times                                      */ 
-    /* first call:      Int_1_Par_Val == 2, Int_2_Par_Val == 3,  */
-    /*                  Int_Par_Ref becomes 7                    */
-    /* second call:     Int_1_Par_Val == 10, Int_2_Par_Val == 5, */
-    /*                  Int_Par_Ref becomes 17                   */
-    /* third call:      Int_1_Par_Val == 6, Int_2_Par_Val == 10, */
-    /*                  Int_Par_Ref becomes 18                   */
-/*
-One_Fifty       Int_1_Par_Val;
-One_Fifty       Int_2_Par_Val;
-One_Fifty      *Int_Par_Ref;
-*/
-{
-  One_Fifty Int_Loc;
-
-  Int_Loc = Int_1_Par_Val + 2;
-  *Int_Par_Ref = Int_2_Par_Val + Int_Loc;
-} /* Proc_7 */
-
-
-void Proc_8 (Arr_1_Dim Arr_1_Par_Ref, Arr_2_Dim Arr_2_Par_Ref, int Int_1_Par_Val, int Int_2_Par_Val)
-/* Converted to ANSI style declaration. JRJ */
-/*********************************************************************/
-    /* executed once      */
-    /* Int_Par_Val_1 == 3 */
-    /* Int_Par_Val_2 == 7 */
-/*
-Arr_1_Dim       Arr_1_Par_Ref;
-Arr_2_Dim       Arr_2_Par_Ref;
-int             Int_1_Par_Val;
-int             Int_2_Par_Val;
-*/
-{
-  REG One_Fifty Int_Index;
-  REG One_Fifty Int_Loc;
-
-  Int_Loc = Int_1_Par_Val + 5;
-  Arr_1_Par_Ref [Int_Loc] = Int_2_Par_Val;
-  Arr_1_Par_Ref [Int_Loc+1] = Arr_1_Par_Ref [Int_Loc];
-  Arr_1_Par_Ref [Int_Loc+30] = Int_Loc;
-  for (Int_Index = Int_Loc; Int_Index <= Int_Loc+1; ++Int_Index)
-    Arr_2_Par_Ref [Int_Loc] [Int_Index] = Int_Loc;
-  Arr_2_Par_Ref [Int_Loc] [Int_Loc-1] += 1;
-  Arr_2_Par_Ref [Int_Loc+20] [Int_Loc] = Arr_1_Par_Ref [Int_Loc];
-  Int_Glob = 5;
-} /* Proc_8 */
-
-
-Enumeration Func_1 (Capital_Letter Ch_1_Par_Val, Capital_Letter Ch_2_Par_Val)
-/* Converted to ANSI style declaration. JRJ */
-/*************************************************/
-    /* executed three times                                         */
-    /* first call:      Ch_1_Par_Val == 'H', Ch_2_Par_Val == 'R'    */
-    /* second call:     Ch_1_Par_Val == 'A', Ch_2_Par_Val == 'C'    */
-    /* third call:      Ch_1_Par_Val == 'B', Ch_2_Par_Val == 'C'    */
-
-/*
-Capital_Letter   Ch_1_Par_Val;
-Capital_Letter   Ch_2_Par_Val;
-*/
-{
-  Capital_Letter        Ch_1_Loc;
-  Capital_Letter        Ch_2_Loc;
-
-  Ch_1_Loc = Ch_1_Par_Val;
-  Ch_2_Loc = Ch_1_Loc;
-  if (Ch_2_Loc != Ch_2_Par_Val)
-    /* then, executed */
-    return (Ident_1);
-  else  /* not executed */
-  {
-    Ch_1_Glob = Ch_1_Loc;
-    return (Ident_2);
-   }
-} /* Func_1 */
-
-
-Boolean Func_2 (Str_30 Str_1_Par_Ref, Str_30 Str_2_Par_Ref)
-/* Converted to ANSI style declaration. JRJ */
-/*************************************************/
-    /* executed once */
-    /* Str_1_Par_Ref == "DHRYSTONE PROGRAM, 1'ST STRING" */
-    /* Str_2_Par_Ref == "DHRYSTONE PROGRAM, 2'ND STRING" */
-
-/*
-Str_30  Str_1_Par_Ref;
-Str_30  Str_2_Par_Ref;
-*/
-{
-  REG One_Thirty        Int_Loc;
-      Capital_Letter    Ch_Loc;
-
-  Int_Loc = 2;
-  while (Int_Loc <= 2) /* loop body executed once */
-    if (Func_1 (Str_1_Par_Ref[Int_Loc],
-                Str_2_Par_Ref[Int_Loc+1]) == Ident_1)
-      /* then, executed */
-    {
-      Ch_Loc = 'A';
-      Int_Loc += 1;
-    } /* if, while */
-  if (Ch_Loc >= 'W' && Ch_Loc < 'Z')
-    /* then, not executed */
-    Int_Loc = 7;
-  if (Ch_Loc == 'R')
-    /* then, not executed */
-    return (true);
-  else /* executed */
-  {
-    if (strcmp (Str_1_Par_Ref, Str_2_Par_Ref) > 0)
-      /* then, not executed */
-    {
-      Int_Loc += 7;
-      Int_Glob = Int_Loc;
-      return (true);
-    }
-    else /* executed */
-      return (false);
-  } /* if Ch_Loc */
-} /* Func_2 */
-
-
-Boolean Func_3 (Enumeration Enum_Par_Val)
-/* Converted to ANSI style declaration. JRJ */
-/***************************/
-    /* executed once        */
-    /* Enum_Par_Val == Ident_3 */
-/* Enumeration Enum_Par_Val; */
-{
-  Enumeration Enum_Loc;
-
-  Enum_Loc = Enum_Par_Val;
-  if (Enum_Loc == Ident_3)
-    /* then, executed */
-    return (true);
-  else /* not executed */
-    return (false);
-} /* Func_3 */
-

+ 1 - 1
devstone/cdboost/src/cdboost-devstone-atomic-pair.hpp

@@ -27,7 +27,7 @@
 #define P_DEVSTONE_ATOMIC_PAIR_H
 
 #include <boost/simulation/pdevs/atomic.hpp>
-#include "../dhry/dhry_1.c"
+#include "../../dhry/dhry_1.c"
 
 namespace cdpp {
 /**

+ 1 - 1
devstone/cdboost/src/cdboost-devstone-atomic.hpp

@@ -27,7 +27,7 @@
 #define P_DEVSTONE_ATOMIC_H
 
 #include <boost/simulation/pdevs/atomic.hpp>
-#include "../dhry/dhry_1.c"
+#include "../../dhry/dhry_1.c"
 
 namespace cdpp {
 /**

devstone/cadmium/dhry/Makefile → devstone/dhry/Makefile


devstone/cadmium/dhry/dhry.h → devstone/dhry/dhry.h


devstone/cadmium/dhry/dhry_1.c → devstone/dhry/dhry_1.c


devstone/cadmium/dhry/dhry_2.c → devstone/dhry/dhry_2.c


+ 1 - 1
simulators/cdboost

@@ -1 +1 @@
-Subproject commit 6c5f4a457745a5da4f9bf2ddc5a5d46ff4f78fa2
+Subproject commit d1d1ca273dd3293825ecdeb33f72629cd51dce21

+ 1 - 1
simulators/xdevs-java

@@ -1 +1 @@
-Subproject commit 9315e71b46e576b98536150ab52bc900f91e53a8
+Subproject commit 80cea6f2696eed7c4fd39dea2cc52b47c581f283