compiler work.
* Removed malloc's for a couple of static arrays.
* Into one file.
+ * Proc_8 is a bit messy. It originally took a 2 dim array, but
+ sdcc doesnt support this. So the offsets are hard coded...
Notes:
* The comment at the start of Func_1 about the input being
H, R on the first call is wrong - Func_1 is first called
from Func_2 where the input is R, Y. The test still succeeds.
+ References:
+ * http://www.netlib.org/performance/html/dhry.intro.html
+ * http://www.netlib.org/performance/html/dhry.data.col0.html
+
I couldnt find a copyright in the original - the most relevent
part follows:
...!uunet!pcrat!dry2 (results only)
*/
+#define NOENUM 1
+#define NOSTRUCTASSIGN 1
+#define REG
+
#include "dhry.h"
-/* Temporary definitions. Remove soon :) */
-char *strcpy(char *dest, const char *src);
-void *memcpy(void *dest, const char *src, int wLen);
-int strcmp(const char *s1, const char *s2);
+#include <string.h>
+/** For printf */
+#include <stdio.h>
+
+#if defined(SDCC_ds390)
+#include <tinibios.h>
+#define clock() ClockTicks()
+#define CLOCKS_PER_SEC 1000
+#define memcpy(d,s,l) memcpyx(d,s,l)
+
+#elif defined(__z80) || defined(__gbz80)
+unsigned int _clock(void);
+
+#define clock _clock
+#define CLOCKS_PER_SEC 100
+
+#else
+/** For clock() */
+#include <time.h>
+#include <types.h>
+#endif
+
+/** Set to one to print more messages about expected values etc.
+ */
+#define DEBUG 0
+
+#if DEBUG
+#define DPRINTF(_a) printf _a
+#else
+#define DPRINTF(_a)
+#endif
Rec_Pointer Ptr_Glob,
Next_Ptr_Glob;
/* Used instead of malloc() */
static Rec_Type _r[2];
+void mark(void)
+{
+}
+
void Proc_1 (REG Rec_Pointer Ptr_Val_Par);
void Proc_2 (One_Fifty *Int_Par_Ref);
void Proc_5 (void);
void Proc_4 (void);
void Proc_7 (One_Fifty Int_1_Par_Val, One_Fifty Int_2_Par_Val, One_Fifty *Int_Par_Ref);
-void Proc_8 (int **Arr_1_Par_Ref, int **Arr_2_Par_Ref,
+void Proc_8 (int *Arr_1_Par_Ref, int *Arr_2_Par_Ref,
int Int_1_Par_Val, int Int_2_Par_Val);
void Proc_6 (Enumeration Enum_Val_Par, Enumeration *Enum_Ref_Par);
void Proc_3 (Rec_Pointer *Ptr_Ref_Par);
Boolean Func_2 (char *Str_1_Par_Ref, char *Str_2_Par_Ref);
Boolean Func_3 (Enumeration Enum_Par_Val);
-void printf(const char *format, ...);
-void exit(int val);
+unsigned getsp(void);
-int _main(void)
+int main(void)
{
One_Fifty Int_1_Loc;
REG One_Fifty Int_2_Loc;
Str_30 Str_2_Loc;
REG int Run_Index;
REG int Number_Of_Runs;
+ unsigned long runTime;
printf("[dhry]\n");
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,
+ 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. */
- Number_Of_Runs = 5;
+ /* 32766 is the highest value for a 16 bitter */
+#if DEBUG
+ Number_Of_Runs = 1;
+#else
+ Number_Of_Runs = 32766;
+#endif
+
+ runTime = clock();
/* Main test loop */
for (Run_Index = 1; Run_Index <= Number_Of_Runs; ++Run_Index) {
- printf("Proc_5\n");
+ DPRINTF(("Run_Index = %d\n", Run_Index));
+ if (!(Run_Index & 1023))
+ printf("Loops: %u\r\n", Run_Index);
Proc_5();
Proc_4();
/* Ch_1_Glob == 'A', Ch_2_Glob == 'B', Bool_Glob == true */
+ DPRINTF(("Ch_1_Glob '%c' == 'A', Ch_2_Glob '%c' == 'B', Bool_Glob %d == 1\n", Ch_1_Glob, Ch_2_Glob, Bool_Glob));
+
Int_1_Loc = 2;
Int_2_Loc = 3;
strcpy (Str_2_Loc, "DHRYSTONE PROGRAM, 2'ND STRING");
Enum_Loc = Ident_2;
- printf("Func_2\n");
Bool_Glob = ! Func_2 (Str_1_Loc, Str_2_Loc);
/* Bool_Glob == 1 */
+ DPRINTF(("Bool_Glob %d == 1, Int_1_Loc %d == 2, Int_2_Loc %d == 3\n", Bool_Glob, Int_1_Loc, Int_2_Loc));
while (Int_1_Loc < Int_2_Loc) /* loop body executed once */
{
- printf("m.1 Executes once.\n");
+ DPRINTF(("m.1 Executes once.\n"));
Int_3_Loc = 5 * Int_1_Loc - Int_2_Loc;
/* Int_3_Loc == 7 */
- printf("Proc_7\n");
+ DPRINTF(("Int_3_Loc %d == 7\n", Int_3_Loc));
+ DPRINTF(("Proc_7\n"));
Proc_7 (Int_1_Loc, Int_2_Loc, &Int_3_Loc);
/* Int_3_Loc == 7 */
Int_1_Loc += 1;
} /* while */
- printf("m.2 Check above executed once.\n");
+ DPRINTF(("m.2 Check above executed once.\n"));
/* Int_1_Loc == 3, Int_2_Loc == 3, Int_3_Loc == 7 */
- printf("Proc_8\n");
- Proc_8 (Arr_1_Glob, Arr_2_Glob, Int_1_Loc, Int_3_Loc);
+ DPRINTF(("Int_1_Loc %d == 3, Int_2_Loc %d == 3, Int_3_Loc %d == 7\n",
+ Int_1_Loc, Int_2_Loc, Int_3_Loc));
+
+ DPRINTF(("Proc_8\n"));
+ Proc_8 (Arr_1_Glob, (int *)Arr_2_Glob, Int_1_Loc, Int_3_Loc);
/* Int_Glob == 5 */
- printf("Proc_1\n");
+ DPRINTF(("Int_Glob %d == 5\n", Int_Glob));
+ DPRINTF(("Proc_1\n"));
Proc_1 (Ptr_Glob);
for (Ch_Index = 'A'; Ch_Index <= Ch_2_Glob; ++Ch_Index)
/* loop body executed twice */
{
- printf("Func_1\n");
+ DPRINTF(("Func_1\n"));
if (Enum_Loc == Func_1 (Ch_Index, 'C'))
/* then, not executed */
{
- printf("Proc_6\n");
+ DPRINTF(("Proc_6\n"));
Proc_6 (Ident_1, &Enum_Loc);
strcpy (Str_2_Loc, "DHRYSTONE PROGRAM, 3'RD STRING");
Int_2_Loc = 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;
+ DPRINTF(("Int_1_Loc %d == 3, Int_2_Loc %d == 3, Int_3_Loc %d == 7\n",
+ Int_1_Loc, Int_2_Loc, Int_3_Loc));
+
+ Int_2_Loc = Int_2_Loc * Int_1_Loc; /* i2 = 3 * 3 = 9 */
+ Int_1_Loc = Int_2_Loc / Int_3_Loc; /* i1 = 9 / 7 = 1 */
+ Int_2_Loc = 7 * (Int_2_Loc - Int_3_Loc) - Int_1_Loc; /* i2 = 7 * (9 - 7) - 1 */
/* Int_1_Loc == 1, Int_2_Loc == 13, Int_3_Loc == 7 */
- printf("Proc_2\n");
+ DPRINTF(("Int_1_Loc %d == 1, Int_2_Loc %d == 13, Int_3_Loc %d == 7\n",
+ Int_1_Loc, Int_2_Loc, Int_3_Loc));
+ DPRINTF(("Proc_2\n"));
Proc_2 (&Int_1_Loc);
/* Int_1_Loc == 5 */
- printf("Looping.\n");
+ DPRINTF(("Int_1_Loc %d == 5\n", Int_1_Loc));
+ DPRINTF(("Looping.\n"));
} /* loop "for Run_Index" */
- printf("Done.\n");
-#if !SDCC
+ printf("Run_Index = %d\n", Run_Index);
+
+ runTime = clock() - runTime;
+
+#if 1
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 (" should be: %d\n", (int)5);
printf ("Bool_Glob: %d\n", Bool_Glob);
- printf (" should be: %d\n", 1);
+ printf (" should be: %d\n", (int)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 (" should be: %d\n", (int)7);
+#if 1
printf ("Arr_2_Glob[8][7]: %d\n", Arr_2_Glob[8][7]);
+#endif
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 (" Discr: %d\n", (int)Ptr_Glob->Discr);
+ printf (" should be: %d\n", (int)0);
+ printf (" Enum_Comp: %d\n", (int)Ptr_Glob->variant.var_1.Enum_Comp);
+ printf (" should be: %d\n", (int)2);
+ printf (" Int_Comp: %d\n", (int)Ptr_Glob->variant.var_1.Int_Comp);
+ printf (" should be: %d\n", (int)17);
+ printf (" Str_Comp: %s\n", (char *)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 (" should be: %d\n", (int)0);
printf (" Enum_Comp: %d\n", Next_Ptr_Glob->variant.var_1.Enum_Comp);
- printf (" should be: %d\n", 1);
+ printf (" should be: %d\n", (int)1);
printf (" Int_Comp: %d\n", Next_Ptr_Glob->variant.var_1.Int_Comp);
- printf (" should be: %d\n", 18);
+ printf (" should be: %d\n", (int)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 (" should be: %d\n", (int)5);
printf ("Int_2_Loc: %d\n", Int_2_Loc);
- printf (" should be: %d\n", 13);
+ printf (" should be: %d\n", (int)13);
printf ("Int_3_Loc: %d\n", Int_3_Loc);
- printf (" should be: %d\n", 7);
+ printf (" should be: %d\n", (int)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: %d\n", (int)1);
+ printf ("Str_1_Loc: %s\n", (char *)Str_1_Loc);
printf (" should be: DHRYSTONE PROGRAM, 1'ST STRING\n");
- printf ("Str_2_Loc: %s\n", Str_2_Loc);
+ printf ("Str_2_Loc: %s\n", (char *)Str_2_Loc);
printf (" should be: DHRYSTONE PROGRAM, 2'ND STRING\n");
printf ("\n");
#endif
+#if 1
+ printf("Number of runs: %u. runTime: %u.\n", Number_Of_Runs, (unsigned)runTime);
+ mark();
+ printf("Dhrystones/s = %u\n", (unsigned)((unsigned long)Number_Of_Runs / (runTime/CLOCKS_PER_SEC)));
+ printf("MIPS = d/s/1757 = (sigh, need floats...)\n");
+#endif
+#ifdef PRINT_T_STATES
+ _printTStates();
+#endif
+#if 1
+ printf("Time: %lu ticks\n", runTime);
+#endif
}
void Proc_1 (REG Rec_Pointer Ptr_Val_Par)
/* 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);
+#if !defined(SDCC_ds390)
+ structassign (*Ptr_Val_Par->Ptr_Comp, *Ptr_Glob);
+#else
+ /* I have no idea why this is necessary... */
+ memcpyx((void xdata *)*Ptr_Val_Par->Ptr_Comp, (void xdata *)*Ptr_Glob,
+ sizeof(Rec_Type));
+#endif
Ptr_Val_Par->variant.var_1.Int_Comp = 5;
Next_Record->variant.var_1.Int_Comp
= Ptr_Val_Par->variant.var_1.Int_Comp;
One_Fifty Int_Loc;
Enumeration Enum_Loc;
- printf("-> Proc_2\n");
+ DPRINTF(("-> Proc_2\n"));
Int_Loc = *Int_Par_Ref + 10;
do {
- printf("1\n");
+ DPRINTF(("1"));
/* executed once */
if (Ch_1_Glob == 'A')
/* then, executed */
{
- printf("2\n");
+ DPRINTF(("2"));
Int_Loc -= 1;
*Int_Par_Ref = Int_Loc - Int_Glob;
Enum_Loc = Ident_1;
} /* if */
- printf("3\n");
+ DPRINTF(("3"));
} while (Enum_Loc != Ident_1); /* true */
- printf("Proc_2 done.\n");
+ DPRINTF(("Proc_2 done.\n"));
} /* Proc_2 */
{
Boolean Bool_Loc;
- printf("-> Proc_4\n");
+ DPRINTF(("-> Proc_4\n"));
Bool_Loc = Ch_1_Glob == 'A';
Bool_Glob = Bool_Loc | Bool_Glob;
Ch_2_Glob = 'B';
- printf("Expect Ch_1_Glob '%c' == 'A'\n", (char)Ch_1_Glob);
- printf(" Ch_2_Glob '%c' == 'B'\n", (char)Ch_2_Glob);
- printf(" Bool_Loc %d == 1\n", (unsigned)Bool_Loc);
- printf(" Bool_Glob %d == 1\n", (unsigned)Bool_Glob);
+ DPRINTF(("Expect Ch_1_Glob '%c' == 'A'\n", (char)Ch_1_Glob));
+ DPRINTF((" Ch_2_Glob '%c' == 'B'\n", (char)Ch_2_Glob));
+ DPRINTF((" Bool_Loc %d == 1\n", (unsigned)Bool_Loc));
+ DPRINTF((" Bool_Glob %d == 1\n", (unsigned)Bool_Glob));
} /* Proc_4 */
Capital_Letter Ch_1_Loc;
Capital_Letter Ch_2_Loc;
- printf("-> Func_1\n");
- printf(" Inputs: Ch_1_Par_Val '%c' == { H, A, B }\n", (char)Ch_1_Par_Val);
- printf(" Ch_2_Par_Val '%c' == { R, C, C }\n", (char)Ch_2_Par_Val);
+ DPRINTF(("-> Func_1\n"));
+ DPRINTF((" Inputs: Ch_1_Par_Val '%c' == { R, A, B }\n", (char)Ch_1_Par_Val));
+ DPRINTF((" Ch_2_Par_Val '%c' == { Y, C, C }\n", (char)Ch_2_Par_Val));
Ch_1_Loc = Ch_1_Par_Val;
Ch_2_Loc = Ch_1_Loc;
/*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)*/
-void Proc_8 (int **Arr_1_Par_Ref, int **Arr_2_Par_Ref,
+void Proc_8 (int *Arr_1_Par_Ref, int *Arr_2_Par_Ref,
int Int_1_Par_Val, int Int_2_Par_Val)
{
REG One_Fifty Int_Index;
REG One_Fifty Int_Loc;
+ DPRINTF(("-> Proc_8\n"));
Int_Loc = Int_1_Par_Val + 5;
Arr_1_Par_Ref [Int_Loc] = Int_2_Par_Val;
+ DPRINTF(("Int_Loc %d == 8 Int_2_Par_Val %d == 7\n", 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];
+ Arr_2_Par_Ref [Int_Loc*50 + Int_Index] = Int_Loc;
+ Arr_2_Par_Ref [Int_Loc * 50 + Int_Loc-1] += 1;
+ Arr_2_Par_Ref [(Int_Loc+20 *50) + Int_Loc] = Arr_1_Par_Ref [Int_Loc];
Int_Glob = 5;
+ DPRINTF(("Arr_1_Glob[8] %d == 7\n", Arr_1_Par_Ref[8]));
}
/*********************************************************************/
REG One_Thirty Int_Loc;
Capital_Letter Ch_Loc;
- printf("-> Func_2\n");
- printf(" Inputs Str_1_Par_Ref \"%s\" = \"DHRYSTONE PROGRAM, 1'ST STRING\"\n", Str_1_Par_Ref);
- printf(" Str_2_Par_Ref \"%s\" = \"DHRYSTONE PROGRAM, 2'ND STRING\"\n", Str_2_Par_Ref);
+ DPRINTF(("-> Func_2\n"));
+ DPRINTF((" Inputs Str_1_Par_Ref \"%s\" = \"DHRYSTONE PROGRAM, 1'ST STRING\"\n", Str_1_Par_Ref));
+ DPRINTF((" Str_2_Par_Ref \"%s\" = \"DHRYSTONE PROGRAM, 2'ND STRING\"\n", Str_2_Par_Ref));
Int_Loc = 2;
while (Int_Loc <= 2) {
-#if BROKEN_SDCC
- char a, b;
- printf(" 2.1 Runs once Int_Loc %u = 2.\n", (unsigned)Int_Loc);
- /* loop body executed once */
- a = Str_1_Par_Ref[Int_Loc];
- b = Str_2_Par_Ref[Int_Loc+1];
- if (Func_1 (a, b) == Ident_1)
-#else
if (Func_1 (Str_1_Par_Ref[Int_Loc],
Str_2_Par_Ref[Int_Loc+1]) == Ident_1)
-#endif
/* then, executed */
{
- printf(" 2.3 Then OK.\n");
+ DPRINTF((" 2.3 Then OK.\n"));
Ch_Loc = 'A';
Int_Loc += 1;
} /* if, while */
else {
- printf(" 2.2 Error.\n");
+ DPRINTF((" 2.2 Error.\n"));
}
}
- if (Ch_Loc >= 'W' && Ch_Loc < 'Z')
+ if (Ch_Loc >= 'W' && Ch_Loc < 'Z') {
/* then, not executed */
+ DPRINTF((" 2.4 Error\n"));
Int_Loc = 7;
- if (Ch_Loc == 'R')
+ }
+ if (Ch_Loc == 'R') {
/* then, not executed */
+ DPRINTF((" 2.5 Error\n"));
return (true);
+ }
else /* executed */
{
+ DPRINTF(("Str_1_Par_Ref = \"%s\", Str_2_Par_Ref = \"%s\"\n",
+ Str_1_Par_Ref, Str_2_Par_Ref));
if (strcmp (Str_1_Par_Ref, Str_2_Par_Ref) > 0)
/* then, not executed */
{
+ DPRINTF((" 2.5 Error diff=%d\n", strcmp(Str_1_Par_Ref, Str_2_Par_Ref)));
Int_Loc += 7;
Int_Glob = Int_Loc;
return (true);
}
- else /* executed */
+ else {
+ /* executed */
+ DPRINTF((" 2.6 OK\n"));
return (false);
+ }
} /* if Ch_Loc */
} /* Func_2 */
+
projects / fw / sdcc / blobdiff