X-Git-Url: https://git.libre-soc.org/?p=riscv-tests.git;a=blobdiff_plain;f=benchmarks%2Fdhrystone%2Fdhrystone.h;h=89616afd3b45fec691f538ee101e9038db426b6e;hp=8abb8746752829df8eed9df124a54b235ab7d44c;hb=35c6ac438af5086510fe120b575090cf8e9b917b;hpb=23507d668862dff15a898f20e109a46c6e95780d diff --git a/benchmarks/dhrystone/dhrystone.h b/benchmarks/dhrystone/dhrystone.h index 8abb874..89616af 100644 --- a/benchmarks/dhrystone/dhrystone.h +++ b/benchmarks/dhrystone/dhrystone.h @@ -1,3 +1,5 @@ +// See LICENSE for license details. + #ifndef _DHRYSTONE_H #define _DHRYSTONE_H @@ -379,15 +381,11 @@ extern clock_t clock(); #elif defined(__riscv) -#define HZ 976563 -#define Too_Small_Time 50 -#define rdcycle() ({ \ - long __x; \ - asm volatile("rdcycle %0; srl %0, %0, 10" : "=r"(__x)); \ - __x; }) +#define HZ 1000000 +#define Too_Small_Time 1 #define CLOCK_TYPE "rdcycle()" -#define Start_Timer() Begin_Time = rdcycle() -#define Stop_Timer() End_Time = rdcycle() +#define Start_Timer() Begin_Time = read_csr(mcycle) +#define Stop_Timer() End_Time = read_csr(mcycle) #else /* Use times(2) time function unless */ @@ -476,16 +474,4 @@ typedef struct record } variant; } Rec_Type, *Rec_Pointer; -void Proc_1(Rec_Pointer Ptr_Val_Par); -void Proc_2(int* Int_Par_Ref); -void Proc_3(Rec_Pointer* Ptr_Ref_Par); -void Proc_4(); -void Proc_5(); -void Proc_6(Enumeration Enum_Val_Par, Enumeration* Enum_Ref_Par); -void Proc_7(int Int_1_Par_Val, int Int_2_Par_Val, int* Int_Par_Ref); -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); -Enumeration Func_1 (char Ch_1_Par_Val, char Ch_2_Par_Val); -Boolean Func_2(Str_30 Str_1_Par_Ref, Str_30 Str_2_Par_Ref); -Boolean Func_3(Enumeration Enum_Par_Val); - #endif