changeset 05a2f6ac1f8e in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=05a2f6ac1f8e
description:
Ruby: Remove store buffer
This patch removes the store buffer from Ruby. It is not in use
currently.
Since libruby is being and store buffer makes calls to libruby, it is
not
possible to maintain it until substantial changes are made.
diffstat:
src/mem/ruby/storebuffer/SConscript | 37 ---
src/mem/ruby/storebuffer/stb_interface.cc | 85 --------
src/mem/ruby/storebuffer/stb_interface.hh | 38 ---
src/mem/ruby/storebuffer/storebuffer.cc | 299 ------------------------------
src/mem/ruby/storebuffer/storebuffer.hh | 151 ---------------
5 files changed, 0 insertions(+), 610 deletions(-)
diffs (truncated from 630 to 300 lines):
diff -r 6782b51ae8a8 -r 05a2f6ac1f8e src/mem/ruby/storebuffer/SConscript
--- a/src/mem/ruby/storebuffer/SConscript Fri Feb 25 17:54:56 2011 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-# -*- mode:python -*-
-
-# Copyright (c) 2009 The Hewlett-Packard Development Company
-# All rights reserved.
-#
-# 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.
-#
-# Authors: Nathan Binkert
-
-Import('*')
-
-if not env['RUBY']:
- Return()
-
-Source('stb_interface.cc')
-Source('storebuffer.cc')
diff -r 6782b51ae8a8 -r 05a2f6ac1f8e src/mem/ruby/storebuffer/stb_interface.cc
--- a/src/mem/ruby/storebuffer/stb_interface.cc Fri Feb 25 17:54:56 2011 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 1999-2008 Mark D. Hill and David A. Wood
- * All rights reserved.
- *
- * 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 <iostream>
-
-#include "mem/ruby/storebuffer/stb_interface.hh"
-
-StoreBuffer *
-createNewSTB(uint32 id, uint32 block_bits, int storebuffer_size)
-{
- StoreBuffer *stb = new StoreBuffer(id, block_bits, storebuffer_size);
- return stb;
-}
-
-storebuffer_status_t
-handleStore(StoreBuffer *storebuffer, const RubyRequest &request)
-{
- assert(request.type == RubyRequestType_ST);
- if (storebuffer->storeBufferFull()){
- return WB_FULL;
- } else if (storebuffer->storeBufferFlushing()) {
- return WB_FLUSHING;
- } else {
- storebuffer->addToStoreBuffer(request);
- return WB_OK;
- }
-}
-
-uint64_t
-handleLoad(StoreBuffer *storebuffer, const RubyRequest &request)
-{
- assert(request.type == RubyRequestType_LD);
- return storebuffer->handleLoad(request);
-}
-
-#if 0
-uint64_t
-handleAtomic(StoreBuffer *storebuffer, const RubyRequest &request)
-{
- // flush the store buffer
- storebuffer->flushStoreBuffer();
- // let storebuffer issue atomic
- // return storebuffer->issueAtomic(request);
-}
-#endif
-
-void
-flushSTB(StoreBuffer *storebuffer)
-{
- // in in-order can't get a request to flushSTB if already flushing
- // on out of order, have to check if already flushing
- storebuffer->flushStoreBuffer();
-}
-
-void
-registerHitCallback(StoreBuffer *storebuffer,
- void (*hit_callback)(int64_t access_id))
-{
- storebuffer->registerHitCallback(hit_callback);
-}
diff -r 6782b51ae8a8 -r 05a2f6ac1f8e src/mem/ruby/storebuffer/stb_interface.hh
--- a/src/mem/ruby/storebuffer/stb_interface.hh Fri Feb 25 17:54:56 2011 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 1999-2008 Mark D. Hill and David A. Wood
- * All rights reserved.
- *
- * 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 "mem/ruby/storebuffer/storebuffer.hh"
-
-StoreBuffer *createNewSTB(uint32 id, uint32 block_bits, int storebuffer_size);
-storebuffer_status_t handleStore(StoreBuffer *storebuffer,
- const RubyRequest &request);
-uint64_t handleLoad(StoreBuffer *storebuffer, const RubyRequest &request);
-uint64_t handleAtomic(StoreBuffer *storebuffer, const RubyRequest &request);
-void flushSTB(StoreBuffer *storebuffer);
-void registerHitCallback(StoreBuffer *storebuffer,
- void (*hit_callback)(int64_t access_id));
diff -r 6782b51ae8a8 -r 05a2f6ac1f8e src/mem/ruby/storebuffer/storebuffer.cc
--- a/src/mem/ruby/storebuffer/storebuffer.cc Fri Feb 25 17:54:56 2011 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,299 +0,0 @@
-/*
- * Copyright (c) 1999-2008 Mark D. Hill and David A. Wood
- * All rights reserved.
- *
- * 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 <cassert>
-#include <cstdio>
-#include <map>
-
-#include "base/trace.hh"
-#include "mem/ruby/common/Global.hh"
-#include "mem/ruby/storebuffer/storebuffer.hh"
-
-using namespace std;
-
-#define SYSTEM_EXIT assert(0)
-
-// global map of request id_s to map them back to storebuffer pointers
-map<uint64_t, StoreBuffer *> request_map;
-
-void
-hit(int64_t id)
-{
- if (request_map.find(id) == request_map.end()) {
- panic("Request ID %d not found in the map\n", id);
- } else {
- request_map[id]->complete(id);
- request_map.erase(id);
- }
-}
-
-StoreBuffer::StoreBuffer(uint32 id, uint32 block_bits, int storebuffer_size)
-{
- iseq = 0;
- tso_iseq = 0;
- char name [] = "Sequencer_";
- char port_name [13];
- sprintf(port_name, "%s%d", name, id);
- m_hit_callback = NULL;
- assert(storebuffer_size >= 0);
- m_storebuffer_size = storebuffer_size;
- m_id = id;
- m_block_size = 1 << block_bits;
- m_block_mask = ~(m_block_size - 1);
- m_buffer_size = 0;
- m_storebuffer_full = false;
- m_storebuffer_flushing = false;
- m_stalled_issue = true;
-}
-
-StoreBuffer::~StoreBuffer()
-{
-}
-
-void
-StoreBuffer::registerHitCallback(void (*hit_callback)(int64_t request_id))
-{
- assert(m_hit_callback == NULL); // can't assign hit_callback twice
- m_hit_callback = hit_callback;
-}
-
-
-void
-StoreBuffer::addToStoreBuffer(RubyRequest request)
-{
- buffer.push_front(SBEntry(request, NULL));
-
- m_buffer_size++;
-
- if (m_buffer_size >= m_storebuffer_size) {
- m_storebuffer_full = true;
- } else if (m_stalled_issue) {
- m_stalled_issue = false;
- issueNextStore();
- }
-
- iseq++;
-}
-
-
-// Return value of -2 indicates that the load request was satisfied by
-// the store buffer
-// Return value of -3 indicates a partial match, so the load has to
-// retry until NO_MATCH
-// Alternatively we could satisfy the partial match, but tso gets
-// complicated and more races
-int64_t
-StoreBuffer::handleLoad(RubyRequest request)
-{
- load_match match = checkForLoadHit(request);
- if (match == FULL_MATCH) {
- // fill data
- returnMatchedData(request);
- iseq++;
- return -2;
- } else { // partial match
- return -3;
- }
-}
-
-// This function will fill the data array if any match is found
_______________________________________________
m5-dev mailing list
m5-dev@m5sim.org
http://m5sim.org/mailman/listinfo/m5-dev
