<div dir="auto"><div><br><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Fri, Feb 21, 2020, 11:27 AM Hesham Almatary <<a href="mailto:hesham.almatary@cl.cam.ac.uk">hesham.almatary@cl.cam.ac.uk</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">On Fri, 21 Feb 2020 at 17:11, Gedare Bloom <<a href="mailto:gedare@rtems.org" target="_blank" rel="noreferrer">gedare@rtems.org</a>> wrote:<br>
><br>
> What is the difference between the CTSRD-CHERI fork and the upstream Coremark?<br>
><br>
I submitted a pending PR to CoreMark/upstream to add RTEMS support<br>
[1]. I have more flexbility and control over the CTSRD-CHERI fork to<br>
push/use<br>
fixess/features more quickly. Furthermore, CHERI-related bits and<br>
another pending PR aren't upstream yet [2].<br>
<br>
Currently, I have no problem just using the upstream one once my PR is<br>
merged and later if we add CHERI support to RTEMS upstream, change the<br>
fork.<br>
<br>
[1] <a href="https://github.com/eembc/coremark/pull/21" rel="noreferrer noreferrer" target="_blank">https://github.com/eembc/coremark/pull/21</a><br>
[2] <a href="https://github.com/eembc/coremark/pull/19" rel="noreferrer noreferrer" target="_blank">https://github.com/eembc/coremark/pull/19</a><br>
<br>
> It should be made clear in the repo the license of the Coremark (APL<br>
> 1.0 I believe)<br>
><br>
That's included in the coremark repo itself. Do you suggest adding a<br>
note in the commit message about the license?<br></blockquote></div></div><div dir="auto"><br></div><div dir="auto">That would be good but it should also be in the contents of the repo so a tar release has the info.</div><div dir="auto"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
> On Fri, Feb 21, 2020 at 10:00 AM Hesham Almatary<br>
> <<a href="mailto:Hesham.Almatary@cl.cam.ac.uk" target="_blank" rel="noreferrer">Hesham.Almatary@cl.cam.ac.uk</a>> wrote:<br>
> ><br>
> > CoreMark's primary goals are simplicity and providing a method for testing only a processor's core features.<br>
> > It is used primarily here as a performance benchmark<br>
> ><br>
> > Built and tested for RISC-V rv64imafdc_medany on QEMU and HW<br>
> > ---<br>
> > .gitmodules | 3 +++<br>
> > benchmarks/coremark/coremark | 1 +<br>
> > benchmarks/coremark/wscript | 48 ++++++++++++++++++++++++++++++++++++<br>
> > benchmarks/wscript | 2 ++<br>
> > 4 files changed, 54 insertions(+)<br>
> > create mode 160000 benchmarks/coremark/coremark<br>
> > create mode 100644 benchmarks/coremark/wscript<br>
> ><br>
> > diff --git a/.gitmodules b/.gitmodules<br>
> > index ae86e49..2bcba90 100644<br>
> > --- a/.gitmodules<br>
> > +++ b/.gitmodules<br>
> > @@ -1,3 +1,6 @@<br>
> > [submodule "rtems_waf"]<br>
> > path = rtems_waf<br>
> > url = git://<a href="http://git.rtems.org/rtems_waf.git" rel="noreferrer noreferrer" target="_blank">git.rtems.org/rtems_waf.git</a><br>
> > +[submodule "benchmarks/coremark/coremark"]<br>
> > + path = benchmarks/coremark/coremark<br>
> > + url = git@github.com:CTSRD-CHERI/coremark.git<br>
> > diff --git a/benchmarks/coremark/coremark b/benchmarks/coremark/coremark<br>
> > new file mode 160000<br>
> > index 0000000..cdafe98<br>
> > --- /dev/null<br>
> > +++ b/benchmarks/coremark/coremark<br>
> > @@ -0,0 +1 @@<br>
> > +Subproject commit cdafe986865cf46a3222f7bf28be82fc8d96fa8f<br>
> > diff --git a/benchmarks/coremark/wscript b/benchmarks/coremark/wscript<br>
> > new file mode 100644<br>
> > index 0000000..c2c225a<br>
> > --- /dev/null<br>
> > +++ b/benchmarks/coremark/wscript<br>
> > @@ -0,0 +1,48 @@<br>
> > +#-<br>
> > +# SPDX-License-Identifier: BSD-2-Clause<br>
> > +#<br>
> > +# Copyright (c) 2020 Hesham Almatary<br>
> > +#<br>
> > +# This software was developed by SRI International and the University of<br>
> > +# Cambridge Computer Laboratory (Department of Computer Science and<br>
> > +# Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the<br>
> > +# DARPA SSITH research programme.<br>
> > +#<br>
> > +# Redistribution and use in source and binary forms, with or without<br>
> > +# modification, are permitted provided that the following conditions<br>
> > +# are met:<br>
> > +# 1. Redistributions of source code must retain the above copyright<br>
> > +# notice, this list of conditions and the following disclaimer.<br>
> > +# 2. Redistributions in binary form must reproduce the above copyright<br>
> > +# notice, this list of conditions and the following disclaimer in the<br>
> > +# documentation and/or other materials provided with the distribution.<br>
> > +#<br>
> > +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND<br>
> > +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE<br>
> > +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE<br>
> > +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE<br>
> > +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL<br>
> > +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS<br>
> > +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)<br>
> > +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT<br>
> > +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY<br>
> > +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF<br>
> > +# SUCH DAMAGE.<br>
> > +#<br>
> > +<br>
> > +import rtems_waf.rtems as rtems<br>
> > +<br>
> > +def build(bld):<br>
> > + rtems.build(bld)<br>
> > +<br>
> > + bld(features = 'c cprogram',<br>
> > + target = 'coremark.bin',<br>
> > + includes = 'coremark/ coremark/rtems',<br>
> > + source = ['coremark/rtems/core_portme.c',<br>
> > + 'coremark/core_list_join.c', 'coremark/core_main.c', 'coremark/core_matrix.c', 'coremark/core_state.c', 'coremark/core_util.c'],<br>
> > +<br>
> > + defines = [<br>
> > + # FLAGS_STR is used within CoreMark to print the compiler flags used<br>
> > + 'FLAGS_STR="'+' '.join([str(flag) for flag in bld.env.CFLAGS])+'"'<br>
> > + ]<br>
> > + )<br>
> > diff --git a/benchmarks/wscript b/benchmarks/wscript<br>
> > index 12741e7..24db85b 100644<br>
> > --- a/benchmarks/wscript<br>
> > +++ b/benchmarks/wscript<br>
> > @@ -1,3 +1,4 @@<br>
> > +# Copyright 2020 Hesham Almatary (<a href="mailto:hesham.almatary@cl.cam.ac.uk" target="_blank" rel="noreferrer">hesham.almatary@cl.cam.ac.uk</a>)<br>
> > # Copyright 2013 Gedare Bloom (<a href="mailto:gedare@rtems.org" target="_blank" rel="noreferrer">gedare@rtems.org</a>)<br>
> > #<br>
> > # This file's license is 2-clause BSD as in this distribution's LICENSE.2 file.<br>
> > @@ -7,4 +8,5 @@ import rtems_waf.rtems as rtems<br>
> ><br>
> > def build(bld):<br>
> > bld.recurse('nbench')<br>
> > + bld.recurse('coremark')<br>
> ><br>
> > --<br>
> > 2.17.1<br>
> ><br>
> > _______________________________________________<br>
> > devel mailing list<br>
> > <a href="mailto:devel@rtems.org" target="_blank" rel="noreferrer">devel@rtems.org</a><br>
> > <a href="http://lists.rtems.org/mailman/listinfo/devel" rel="noreferrer noreferrer" target="_blank">http://lists.rtems.org/mailman/listinfo/devel</a><br>
> _______________________________________________<br>
> devel mailing list<br>
> <a href="mailto:devel@rtems.org" target="_blank" rel="noreferrer">devel@rtems.org</a><br>
> <a href="http://lists.rtems.org/mailman/listinfo/devel" rel="noreferrer noreferrer" target="_blank">http://lists.rtems.org/mailman/listinfo/devel</a><br>
_______________________________________________<br>
devel mailing list<br>
<a href="mailto:devel@rtems.org" target="_blank" rel="noreferrer">devel@rtems.org</a><br>
<a href="http://lists.rtems.org/mailman/listinfo/devel" rel="noreferrer noreferrer" target="_blank">http://lists.rtems.org/mailman/listinfo/devel</a><br>
</blockquote></div></div></div>