derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

miscL Merge stable branch (v22.0.0.1) into develop

Browse Source 
Change-Id: I502c1ed209d2707ed6271cc31ab58f1e8884335b
This commit is contained in:
Bobby R. Bruce
2022-06-18 11:46:33 -04:00
parent 72290f00fd 39f85b7a3b
commit 938d017fed
14 changed files with 411 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Doxyfile
View File

@@ -31,7 +31,7 @@ PROJECT_NAME = gem5
# This could be handy for archiving the generated documentation or
# if some version control system is used.
PROJECT_NUMBER = DEVELOP-FOR-V22-0
PROJECT_NUMBER = v22.0.0.1
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.

2
src/base/version.cc
View File

@@ -32,6 +32,6 @@ namespace gem5
/**
* @ingroup api_base_utils
*/
const char *gem5Version = "[DEVELOP-FOR-v22.0]";
const char *gem5Version = "22.0.0.1";
} // namespace gem5

48
src/dev/virtio/VirtIORng 2.py Normal file
View File

@@ -0,0 +1,48 @@
# -*- mode:python -*-
# Copyright (c) 2022 Institute of Computing Technology, Chinese
# Academy of Sciences
# All rights reserved.
#
# The license below extends only to copyright in the software and shall
# not be construed as granting a license to any other intellectual
# property including but not limited to intellectual property relating
# to a hardware implementation of the functionality of the software
# licensed hereunder. You may use the software subject to the license
# terms below provided that you ensure that this notice is replicated
# unmodified and in its entirety in all distributions of the software,
# modified or unmodified, in source code or in binary form.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met: redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer;
# redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution;
# neither the name of the copyright holders nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
from m5.params import *
from m5.proxy import *
from m5.objects.VirtIO import VirtIODeviceBase
class VirtIORng(VirtIODeviceBase):
type = 'VirtIORng'
cxx_header = 'dev/virtio/rng.hh'
cxx_class = 'gem5::VirtIORng'
qSize = Param.Unsigned(16, "Request queue size")

94
src/dev/virtio/rng 2.cc Normal file
View File

@@ -0,0 +1,94 @@
/*
* Copyright (c) 2022 Institute of Computing Technology, Chinese Academy
* of Sciences
* All rights reserved
*
* The license below extends only to copyright in the software and shall
* not be construed as granting a license to any other intellectual
* property including but not limited to intellectual property relating
* to a hardware implementation of the functionality of the software
* licensed hereunder. You may use the software subject to the license
* terms below provided that you ensure that this notice is replicated
* unmodified and in its entirety in all distributions of the software,
* modified or unmodified, in source code or in binary form.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met: redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer;
* redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution;
* neither the name of the copyright holders nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "dev/virtio/rng.hh"
#include "base/random.hh"
#include "debug/VIORng.hh"
#include "params/VirtIORng.hh"
#include "sim/system.hh"
namespace gem5
{
VirtIORng::VirtIORng(const Params &params)
: VirtIODeviceBase(params, ID_RNG, 0, 0),
qReq(params.system->physProxy, byteOrder, params.qSize, *this)
{
registerQueue(qReq);
}
VirtIORng::~VirtIORng()
{
}
VirtIORng::RngQueue::RngQueue(PortProxy &proxy, ByteOrder bo, uint16_t size,
VirtIORng &_parent)
: VirtQueue(proxy, bo, size), parent(_parent)
{
}
void
VirtIORng::readConfig(PacketPtr pkt, Addr cfgOffset)
{
// There are no configuration for RNG device
pkt->makeResponse();
}
void
VirtIORng::RngQueue::trySend()
{
DPRINTF(VIORng, "try send\n");
VirtDescriptor *d;
while ((d = consumeDescriptor())) {
DPRINTF(VIORng, "Got descriptor (len: %i)\n", d->size());
size_t len = 0;
while (len < d->size()) {
uint8_t byte = gem5::random_mt.random<uint8_t>();
d->chainWrite(len, &byte, sizeof(uint8_t));
++len;
}
// Tell the guest that we are done with this descriptor.
produceDescriptor(d, len);
parent.kick();
}
}
} // namespace gem5

97
src/dev/virtio/rng 2.hh Normal file
View File

@@ -0,0 +1,97 @@
/*
* Copyright (c) 2022 Institute of Computing Technology, Chinese Academy
* of Sciences
* All rights reserved
*
* The license below extends only to copyright in the software and shall
* not be construed as granting a license to any other intellectual
* property including but not limited to intellectual property relating
* to a hardware implementation of the functionality of the software
* licensed hereunder. You may use the software subject to the license
* terms below provided that you ensure that this notice is replicated
* unmodified and in its entirety in all distributions of the software,
* modified or unmodified, in source code or in binary form.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met: redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer;
* redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution;
* neither the name of the copyright holders nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef __DEV_VIRTIO_RNG_HH__
#define __DEV_VIRTIO_RNG_HH__
#include "base/compiler.hh"
#include "dev/virtio/base.hh"
namespace gem5
{
struct VirtIORngParams;
/**
* VirtIO Rng
*
* @see https://github.com/rustyrussell/virtio-spec
* @see http://docs.oasis-open.org/virtio/virtio/v1.0/virtio-v1.0.html
*/
class VirtIORng : public VirtIODeviceBase
{
public:
typedef VirtIORngParams Params;
VirtIORng(const Params &params);
virtual ~VirtIORng();
void readConfig(PacketPtr pkt, Addr cfgOffset);
protected:
/** VirtIO device ID */
static const DeviceId ID_RNG = 0x04;
protected:
/**
* Virtqueue for data going from the host to the guest.
*/
class RngQueue
: public VirtQueue
{
public:
RngQueue(PortProxy &proxy, ByteOrder bo, uint16_t size,
VirtIORng &_parent);
virtual ~RngQueue() {}
void onNotify() { trySend(); }
/** Try to send data pending data from the terminal. */
void trySend();
std::string name() const { return parent.name() + ".qRecv"; }
protected:
VirtIORng &parent;
};
/** Receive queue for port 0 */
RngQueue qReq;
};
} // namespace gem5
#endif // __DEV_VIRTIO_RNG_HH__

2
src/python/gem5/components/processors/simple_core.py
View File

@@ -25,7 +25,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
from typing import Optional
from python.gem5.utils.requires import requires
from ...utils.requires import requires
from ..processors.abstract_core import AbstractCore
from .cpu_types import CPUTypes

2
src/python/gem5/resources/downloader.py
View File

@@ -54,7 +54,7 @@ def _resources_json_version_required() -> str:
"""
Specifies the version of resources.json to obtain.
"""
return "develop"
return "22.0"
def _get_resources_json_uri() -> str:
return "https://resources.gem5.org/resources.json"