| blob | daa25967f9dfb30d7df2fd6bc3831d79d5146b5c |
1 diff -u coremark_v1.0/core_main.c coremark-r3ka/core_main.c
2 --- coremark_v1.0/core_main.c 2009-08-25 20:11:26.000000000 +0200
3 +++ coremark-r3ka/core_main.c 2021-04-24 14:05:30.165120854 +0200
4 @@ -210,7 +210,7 @@
5 if (divisor==0) /* some machines cast float to int as 0 since this conversion is not defined by ANSI, but we know at least one second passed */
6 divisor=1;
7 results[0].iterations*=1+10/divisor;
8 - }
9 + }results[0].iterations = 60;
10 /* perform actual benchmark */
11 start_time();
12 #if (MULTITHREAD>1)
13 @@ -291,9 +291,9 @@
14 if (time_in_secs(total_time) > 0)
15 ee_printf("Iterations/Sec : %f\n",default_num_contexts*results[0].iterations/time_in_secs(total_time));
16 #else
17 - ee_printf("Total time (secs): %d\n",time_in_secs(total_time));
18 + ee_printf("Total time (secs): %lu\n",time_in_secs(total_time));
19 if (time_in_secs(total_time) > 0)
20 - ee_printf("Iterations/Sec : %d\n",default_num_contexts*results[0].iterations/time_in_secs(total_time));
21 + ee_printf("Iterations/Sec : %lu\n",default_num_contexts*results[0].iterations/time_in_secs(total_time));
22 #endif
23 if (time_in_secs(total_time) < 10) {
24 ee_printf("ERROR! Must execute for at least 10 secs for a valid result!\n");
25 @@ -349,6 +349,8 @@
26 #endif
27 /* And last call any target specific code for finalizing */
28 portable_fini(&(results[0].port));
29 +
30 + ee_printf ("\x04");
32 return MAIN_RETURN_VAL;
33 }
34 diff -u coremark_v1.0/core_portme.c coremark-r3ka/core_portme.c
35 --- coremark_v1.0/core_portme.c 2021-04-24 12:00:51.953682684 +0200
36 +++ coremark-r3ka/core_portme.c 2021-04-24 12:28:28.405108427 +0200
37 @@ -5,8 +5,11 @@
38 Author : Shay Gal-On, EEMBC
39 Legal : TODO!
40 */
41 +#include <stdio.h>
42 +#include <stdlib.h>
43 #include "coremark.h"
44 -#include "core_portme.h"
45 +
46 +#define ITERATIONS 100
48 #if VALIDATION_RUN
49 volatile ee_s32 seed1_volatile=0x3415;
50 @@ -30,20 +33,22 @@
51 e.g. Read value from on board RTC, read value from cpu clock cycles performance counter etc.
52 Sample implementation for standard time.h and windows.h definitions included.
53 */
54 -CORETIMETYPE barebones_clock() {
55 - #error "You must implement a method to measure time in barebones_clock()! This function should return current time.\n"
56 -}
57 /* Define : TIMER_RES_DIVIDER
58 Divider to trade off timer resolution and total time that can be measured.
60 Use lower values to increase resolution, but make sure that overflow does not occur.
61 If there are issues with the return value overflowing, increase this value.
62 */
63 -#define GETMYTIME(_t) (*_t=barebones_clock())
64 +#define CLOCKS_PER_SEC 32768
65 +#define NSECS_PER_SEC CLOCKS_PER_SEC
66 +unsigned long clock(void);
67 +//#define CORETIMETYPE clock_t
68 +#define CORETIMETYPE unsigned long
69 +#define GETMYTIME(_t) (*_t=clock())
70 #define MYTIMEDIFF(fin,ini) ((fin)-(ini))
71 #define TIMER_RES_DIVIDER 1
72 #define SAMPLE_TIME_IMPLEMENTATION 1
73 -#define EE_TICKS_PER_SEC (CLOCKS_PER_SEC / TIMER_RES_DIVIDER)
74 +#define EE_TICKS_PER_SEC (NSECS_PER_SEC / TIMER_RES_DIVIDER)
76 /** Define Host specific (POSIX), or target specific global time variables. */
77 static CORETIMETYPE start_time_val, stop_time_val;
78 @@ -92,13 +97,16 @@
80 ee_u32 default_num_contexts=1;
82 +void init(void);
83 +
84 /* Function : portable_init
85 Target specific initialization code
86 Test for some common mistakes.
87 */
88 void portable_init(core_portable *p, int *argc, char *argv[])
89 {
90 - #error "Call board initialization routines in portable init (if needed), in particular initialize UART!\n"
91 + init();
92 +
93 if (sizeof(ee_ptr_int) != sizeof(ee_u8 *)) {
94 ee_printf("ERROR! Please define ee_ptr_int to a type that holds a pointer!\n");
95 }
96 @@ -115,4 +123,79 @@
97 p->portable_id=0;
98 }
100 +#include <stdio.h>
101 +#include <stdint.h>
102 +
103 +#define REG(addr, reg) __sfr __at(addr) reg
104 +
105 +REG(0x00, GCSR); // global control / status register
106 +REG(0x01, RTCCR); // Real Time Clock Control Register
107 +REG(0x02, RTC0R); // Real Time Clock Data Register 0
108 +REG(0x03, RTC1R); // Real Time Clock Data Register 1
109 +REG(0x04, RTC2R); // Real Time Clock Data Register 2
110 +REG(0x05, RTC3R); // Real Time Clock Data Register 3
111 +REG(0x06, RTC4R); // Real Time Clock Data Register 4
112 +REG(0x07, RTC5R); // Real Time Clock Data Register 5
113 +REG(0x08, WDTCR); // watch-dog timer control register
114 +REG(0x09, WDTTR); // watch-dog timer test register
115 +REG(0x0F, GCDR); // global clock double register
116 +REG(0x14, MB0CR); // Memory Bank 0 Control Register
117 +REG(0x16, MB2CR); // Memory Bank 2 Control Register
118 +REG(0x55, PCFR); // Port C Function Register
119 +REG(0xA0, TACSR); // Timer A Control/Status Register
120 +REG(0xA9, TAT4R); // Timer A Time Constant 4 Register
121 +REG(0xC0, SADR); // Serial Port A Data Register
122 +REG(0xC3, SASR); // Serial Port A Status Register
123 +REG(0xC4, SACR); // Serial Port A Control Register
124 +
125 +void _sdcc_external_startup(void)
126 +{
127 + // Disable watchdog
128 + WDTTR = 0x51;
129 + WDTTR = 0x54;
130 +
131 + // normal oscillator, processor and peripheral from main clock, no periodic interrupt
132 + GCSR = 0x08;
133 +
134 + GCDR = 0x07; // Double clock to get more speed
135 +
136 + // Configure memory wait states
137 + MB0CR = 0x88; // Flash - 1 wait state (for 45 ns Flash @ 44.2 MHz) with write-protection
138 + MB2CR = 0x85; // RAM - 1 wait states (for 55 ns RAM @ 44.2 MHz)
139 +}
140 +
141 +void init(void)
142 +{
143 + PCFR = 0x40; // Use pin PC6 as TXA
144 + TAT4R = 36 - 1; // Use divider for 38400 baud - value in register is one less than the divider used (e.g. a value of 0 will result in clock division by 1).
145 + TACSR = 0x01; // Enable timer A
146 + SACR = 0x00; // No interrupts, 8-bit async mode
147 +}
148 +
149 +unsigned long clock(void)
150 +{
151 + unsigned long clock0, clock1;
152 + do
153 + {
154 + RTC0R = 0;
155 + clock0 = ((unsigned long)(RTC0R) << 0) | ((unsigned long)(RTC1R) << 8) | ((unsigned long)(RTC2R) << 16) | ((unsigned long)(RTC3R) << 24);
156 + clock1 = ((unsigned long)(RTC0R) << 0) | ((unsigned long)(RTC1R) << 8) | ((unsigned long)(RTC2R) << 16) | ((unsigned long)(RTC3R) << 24);
157 + } while (clock0 != clock1);
158 + return(clock1);
159 +}
160 +
161 +#if defined(__SDCC) && __SDCC_REVISION < 9624 // Old SDCC weirdness
162 +void putchar(char c)
163 +{
164 + while (SASR & 0x04); // Wait for empty transmitter data register
165 + SADR = c;
166 +}
167 +#else // Standard C
168 +int putchar(int c)
169 +{
170 + while (SASR & 0x04); // Wait for empty transmitter data register
171 + SADR = c;
172 + return c;
173 +}
174 +#endif
176 diff -u coremark_v1.0/core_portme.h coremark-r3ka/core_portme.h
177 --- coremark_v1.0/core_portme.h 2021-04-24 12:00:51.953682684 +0200
178 +++ coremark-r3ka/core_portme.h 2021-04-24 12:08:35.390414932 +0200
179 @@ -16,21 +16,21 @@
180 Define to 1 if the platform supports floating point.
181 */
182 #ifndef HAS_FLOAT
183 -#define HAS_FLOAT 1
184 +#define HAS_FLOAT 0
185 #endif
186 /* Configuration : HAS_TIME_H
187 Define to 1 if platform has the time.h header file,
188 and implementation of functions thereof.
189 */
190 #ifndef HAS_TIME_H
191 -#define HAS_TIME_H 1
192 +#define HAS_TIME_H 0
193 #endif
194 /* Configuration : USE_CLOCK
195 Define to 1 if platform has the time.h header file,
196 and implementation of functions thereof.
197 */
198 #ifndef USE_CLOCK
199 -#define USE_CLOCK 1
200 +#define USE_CLOCK 0
201 #endif
202 /* Configuration : HAS_STDIO
203 Define to 1 if the platform has stdio.h.
204 @@ -42,10 +42,16 @@
205 Define to 1 if the platform has stdio.h and implements the printf function.
206 */
207 #ifndef HAS_PRINTF
208 -#define HAS_PRINTF 0
209 +#define HAS_PRINTF 1
210 #endif
212 -
213 +/* Configuration : CORE_TICKS
214 + Define type of return from the timing functions.
215 + */
216 +//#include <time.h>
217 +//typedef clock_t CORE_TICKS;
218 +unsigned long clock(void);
219 +typedef unsigned long CORE_TICKS;
220 /* Definitions : COMPILER_VERSION, COMPILER_FLAGS, MEM_LOCATION
221 Initialize these strings per platform
222 */
223 @@ -57,7 +63,7 @@
224 #endif
225 #endif
226 #ifndef COMPILER_FLAGS
227 - #define COMPILER_FLAGS FLAGS_STR /* "Please put compiler flags here (e.g. -o3)" */
228 + #define COMPILER_FLAGS "Please put compiler flags here (e.g. -o3)"
229 #endif
230 #ifndef MEM_LOCATION
231 #define MEM_LOCATION "STACK"
232 @@ -69,26 +75,23 @@
233 *Imprtant* :
234 ee_ptr_int needs to be the data type used to hold pointers, otherwise coremark may fail!!!
235 */
236 -typedef signed short ee_s16;
237 -typedef unsigned short ee_u16;
238 -typedef signed int ee_s32;
239 -typedef double ee_f32;
240 -typedef unsigned char ee_u8;
241 -typedef unsigned int ee_u32;
242 -typedef ee_u32 ee_ptr_int;
243 +#include <stdio.h>
244 +#include <stddef.h>
245 +#include <stdint.h>
246 +
247 +typedef int16_t ee_s16;
248 +typedef uint16_t ee_u16;
249 +typedef int32_t ee_s32;
250 +typedef float ee_f32;
251 +typedef uint8_t ee_u8;
252 +typedef uint32_t ee_u32;
253 +typedef uintptr_t ee_ptr_int;
254 typedef size_t ee_size_t;
255 -#define NULL ((void *)0)
256 /* align_mem :
257 This macro is used to align an offset to point to a 32b value. It is used in the Matrix algorithm to initialize the input memory blocks.
258 */
259 #define align_mem(x) (void *)(4 + (((ee_ptr_int)(x) - 1) & ~3))
261 -/* Configuration : CORE_TICKS
262 - Define type of return from the timing functions.
263 - */
264 -#define CORETIMETYPE ee_u32
265 -typedef ee_u32 CORE_TICKS;
266 -
267 /* Configuration : SEED_METHOD
268 Defines method to get seed values that cannot be computed at compile time.
270 @@ -146,7 +149,7 @@
271 This flag only matters if MULTITHREAD has been defined to a value greater then 1.
272 */
273 #ifndef MAIN_HAS_NOARGC
274 -#define MAIN_HAS_NOARGC 0
275 +#define MAIN_HAS_NOARGC 1
276 #endif
278 /* Configuration : MAIN_HAS_NORETURN
279 @@ -157,7 +160,7 @@
280 1 - platform does not support returning a value from main
281 */
282 #ifndef MAIN_HAS_NORETURN
283 -#define MAIN_HAS_NORETURN 0
284 +#define MAIN_HAS_NORETURN 1
285 #endif
287 /* Variable : default_num_contexts
288 @@ -183,6 +186,4 @@
289 #endif
290 #endif
292 -int ee_printf(const char *fmt, ...);
293 -
294 #endif /* CORE_PORTME_H */
295 diff -u coremark_v1.0/Makefile coremark-r3ka/Makefile
296 --- coremark_v1.0/Makefile 2009-07-10 19:48:43.000000000 +0200
297 +++ coremark-r3ka/Makefile 2021-04-24 11:59:52.296562209 +0200
298 @@ -1,141 +1,15 @@
299 -#Author : Shay Gal-On, EEMBC
300 -#
301 -#This file is part of EEMBC(R) and CoreMark(TM), which are Copyright (C) 2009
302 -#All rights reserved.
303 -#
304 -#EEMBC CoreMark Software is a product of EEMBC and is provided under the terms of the
305 -#CoreMark License that is distributed with the official EEMBC COREMARK Software release.
306 -#If you received this EEMBC CoreMark Software without the accompanying CoreMark License,
307 -#you must discontinue use and download the official release from www.coremark.org.
308 -#
309 -#Also, if you are publicly displaying scores generated from the EEMBC CoreMark software,
310 -#make sure that you are in compliance with Run and Reporting rules specified in the accompanying readme.txt file.
311 -#
312 -#EEMBC
313 -#4354 Town Center Blvd. Suite 114-200
314 -#El Dorado Hills, CA, 95762
315 +SOURCES = core_list_join.c core_main.c core_matrix.c core_state.c core_util.c core_portme.c
316 +OBJ = $(SOURCES:.c=.rel)
317 +SDCC = sdcc
319 +all: coremark
321 -# Make sure the default target is to simply build and run the benchmark.
322 -RSTAMP = v1.0
323 -
324 -.PHONY: run score
325 -run: $(OUTFILE) rerun score
326 -
327 -score:
328 - @echo "Check run1.log and run2.log for results."
329 - @echo "See readme.txt for run and reporting rules."
330 -
331 -ifndef PORT_DIR
332 -# Ports for a couple of common self hosted platforms
333 -UNAME=$(shell if [[ `uname 2> /dev/null` ]] ; then uname ; fi)
334 -ifneq (,$(findstring CYGWIN,$(UNAME)))
335 -PORT_DIR=cygwin
336 -endif
337 -ifneq (,$(findstring Linux,$(UNAME)))
338 -MACHINE=$(shell uname -m)
339 -ifneq (,$(findstring 64,$(MACHINE)))
340 -PORT_DIR=linux64
341 -else
342 -PORT_DIR=linux
343 -endif
344 -endif
345 -endif
346 -ifndef PORT_DIR
347 -$(error PLEASE define PORT_DIR! (e.g. make PORT_DIR=simple))
348 -endif
349 -vpath %.c $(PORT_DIR)
350 -vpath %.h $(PORT_DIR)
351 -vpath %.mak $(PORT_DIR)
352 -include $(PORT_DIR)/core_portme.mak
353 -
354 -ifndef $(ITERATIONS)
355 -ITERATIONS=0
356 -endif
357 -ifdef REBUILD
358 -FORCE_REBUILD=force_rebuild
359 -endif
360 -
361 -CFLAGS += -DITERATIONS=$(ITERATIONS)
362 -
363 -CORE_FILES = core_list_join core_main core_matrix core_state core_util
364 -ORIG_SRCS = $(addsuffix .c,$(CORE_FILES))
365 -SRCS = $(ORIG_SRCS) $(PORT_SRCS)
366 -OBJS = $(addprefix $(OPATH),$(addsuffix $(OEXT),$(CORE_FILES)) $(PORT_OBJS))
367 -OUTNAME = coremark$(EXE)
368 -OUTFILE = $(OPATH)$(OUTNAME)
369 -LOUTCMD = $(OFLAG) $(OUTFILE) $(LFLAGS_END)
370 -OUTCMD = $(OUTFLAG) $(OUTFILE) $(LFLAGS_END)
371 -
372 -HEADERS = coremark.h
373 -CHECK_FILES = $(ORIG_SRCS) $(HEADERS)
374 -
375 -$(OPATH):
376 - $(MKDIR) $(OPATH)
377 -
378 -.PHONY: compile link
379 -ifdef SEPARATE_COMPILE
380 -$(OPATH)$(PORT_DIR):
381 - $(MKDIR) $(OPATH)$(PORT_DIR)
382 -
383 -compile: $(OPATH) $(OPATH)$(PORT_DIR) $(OBJS) $(HEADERS)
384 -link: compile
385 - $(LD) $(LFLAGS) $(XLFLAGS) $(OBJS) $(LOUTCMD)
386 -
387 -else
388 -
389 -compile: $(OPATH) $(SRCS) $(HEADERS)
390 - $(CC) $(CFLAGS) $(XCFLAGS) $(SRCS) $(OUTCMD)
391 -link: compile
392 - @echo "Link performed along with compile"
393 -
394 -endif
395 -
396 -$(OUTFILE): $(SRCS) $(HEADERS) Makefile core_portme.mak $(FORCE_REBUILD)
397 - $(MAKE) port_prebuild
398 - $(MAKE) link
399 - $(MAKE) port_postbuild
400 -
401 -.PHONY: rerun
402 -rerun:
403 - $(MAKE) XCFLAGS="$(XCFLAGS) -DPERFORMANCE_RUN=1" load run1.log
404 - $(MAKE) XCFLAGS="$(XCFLAGS) -DVALIDATION_RUN=1" load run2.log
405 -
406 -PARAM1=$(PORT_PARAMS) 0x0 0x0 0x66 $(ITERATIONS)
407 -PARAM2=$(PORT_PARAMS) 0x3415 0x3415 0x66 $(ITERATIONS)
408 -PARAM3=$(PORT_PARAMS) 8 8 8 $(ITERATIONS)
409 -
410 -run1.log-PARAM=$(PARAM1) 7 1 2000
411 -run2.log-PARAM=$(PARAM2) 7 1 2000
412 -run3.log-PARAM=$(PARAM3) 7 1 1200
413 -
414 -run1.log run2.log run3.log: load
415 - $(MAKE) port_prerun
416 - $(RUN) $(OUTFILE) $($(@)-PARAM) > $(OPATH)$@
417 - $(MAKE) port_postrun
418 -
419 -.PHONY: gen_pgo_data
420 -gen_pgo_data: run3.log
421 -
422 -.PHONY: load
423 -load: $(OUTFILE)
424 - $(MAKE) port_preload
425 - $(LOAD) $(OUTFILE)
426 - $(MAKE) port_postload
427 -
428 -.PHONY: clean
429 clean:
430 - rm -f $(OUTFILE) $(OPATH)*.log *.info $(OPATH)index.html $(PORT_CLEAN)
431 + rm -f *.ihx *.lnk *.lst *.noi *.rel *.sym *.size *.dot *.lk *.rst *.asm
432 +
433 +%.rel: %.c
434 + $(SDCC) -c --std-c99 --fverbose-asm $(SDCCFLAGS) --fverbose-asm $< ||:
436 -.PHONY: force_rebuild
437 -force_rebuild:
438 - echo "Forcing Rebuild"
439 -
440 -.PHONY: check
441 -check:
442 - md5sum -c coremark.md5
443 +coremark: $(OBJ)
444 + $(SDCC) $(SDCCFLAGS) *.rel -o Coremark.ihx
446 -ifdef ETC
447 -# Targets related to testing and releasing CoreMark. Not part of the general release!
448 -include Makefile.internal
449 -endif