Nikos Nikoleris has uploaded this change for review. ( https://gem5-review.googlesource.com/11115

Change subject: base, mem: Disambiguate if an addr range is contained or overlaps
......................................................................

base, mem: Disambiguate if an addr range is contained or overlaps

We need to determined whether an address range is fully contained or
it overlaps with an address range in the address range in the mmap. As
an example, we use address range maps to associate ports to address
ranges and we determine which port we will forward the request based
on which address range contains the addresses accessed by the
request. We also need to make sure that when we add a new port to the
address range map, its address range does not overlap with any of the
existing ports.

This patch splits the function find() into two functions contains()
and intersects() to implement this distinct functionality. It also
changes the xbar and the physical memory to use the right function.

Change-Id: If3fd3f774a16b27db2df76dc04f1d61824938008
---
M src/base/addr_range_map.hh
M src/mem/physical.cc
M src/mem/xbar.cc
M src/unittest/rangemaptest.cc
4 files changed, 96 insertions(+), 60 deletions(-)



diff --git a/src/base/addr_range_map.hh b/src/base/addr_range_map.hh
index 30bd624..96678ba 100644
--- a/src/base/addr_range_map.hh
+++ b/src/base/addr_range_map.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 ARM Limited
+ * Copyright (c) 2012, 2018 ARM Limited
  * All rights reserved
  *
  * The license below extends only to copyright in the software and shall
@@ -65,65 +65,97 @@
     typedef typename RangeMap::iterator iterator;
     typedef typename RangeMap::const_iterator const_iterator;

+    /**
+     * Find entry that contains the given address range
+     *
+     * Searches through the ranges in the address map and returns an
+     * iterator to the entry which range is a superset of the input
+     * address range. Returns end() if none found.
+     *
+     * @param r An input address range
+     * @return An iterator that contains the input address range
+     */
     const_iterator
-    find(const AddrRange &r) const
+    contains(const AddrRange &r) const
     {
-        if (tree.empty())
-            return tree.end();
+        const_iterator next = tree.upper_bound(r);
+        if (next != end() && r.isSubset(next->first)) {
+            return next;
+        }
+        if (next == begin())
+            return end();
+        next--;

-        const_iterator i = tree.upper_bound(r);
+        const_iterator i;
+        do {
+            i = next;
+            if (r.isSubset(i->first)) {
+                return i;
+            }
+            // Keep looking if the next range merges with the current one.
+        } while (next != tree.begin() &&
+                 (--next)->first.mergesWith(i->first));

-        if (i == tree.begin()) {
+        return tree.end();
+    }
+
+    /**
+     * Find entry that contains the given address
+     *
+     * Searches through the ranges in the address map and returns an
+     * iterator to the entry which range is a superset of the input
+     * address. Returns end() if none found.
+     *
+     * @param r An input address
+     * @return An iterator that contains the input address
+     */
+    const_iterator
+    contains(Addr r) const
+    {
+        return contains(RangeSize(r, 1));
+    }
+
+    /**
+     * Find entry that intersects with the given address range
+     *
+     * Searches through the ranges in the address map and returns an
+     * iterator to the entry which range intersects with the input
+     * address.
+     *
+     * @param r An input address
+     * @return An iterator that intersects with the input address range
+     */
+    const_iterator
+    intersects(const AddrRange &r) const
+    {
+        // find the first range r1 for which r.start < r1.start() and
+        // check if r1 intersects or otherwise if the previous range
+        // intersects
+        const_iterator next = tree.upper_bound(r);
+        if (next != end() && next->first.intersects(r)) {
+            return next;
+        }
+        if (next == begin())
+            return end();
+        next--;
+
+        const_iterator i;
+        do {
+            i = next;
             if (i->first.intersects(r)) {
                 return i;
-            } else {
-                return tree.end();
             }
-        }
-
-        --i;
-
-        if (i->first.intersects(r))
-            return i;
-
-        // if we are looking at an interleaved range, also step
-        // backwards through the ranges while we are looking at ranges
-        // that are part of the same contigous chunk
-        if (i->first.interleaved()) {
-            AddrRange orig_range = i->first;
-
-            while (i != tree.begin() && i->first.mergesWith(orig_range)) {
-                --i;
-                if (i->first.intersects(r)) {
-                    return i;
-                }
-            }
-
-            // we could leave the loop based on reaching the first
-            // element, so we must still check for an intersection
-            if (i->first.intersects(r))
-                return i;
-        }
+ // Keep looking if the next range intersects with the current one.
+        } while (next != tree.begin() &&
+                 (--next)->first.mergesWith(i->first));

         return tree.end();
     }

     const_iterator
-    find(const Addr &r) const
-    {
-        return find(RangeSize(r, 1));
-    }
-
-    bool
-    intersect(const AddrRange &r) const
-    {
-        return find(r) != tree.end();
-    }
-
-    const_iterator
     insert(const AddrRange &r, const V& d)
     {
-        if (intersect(r))
+        if (intersects(r) != tree.end())
             return tree.end();

         return tree.insert(std::make_pair(r, d)).first;
diff --git a/src/mem/physical.cc b/src/mem/physical.cc
index 586f1c4..c7dbb3b 100644
--- a/src/mem/physical.cc
+++ b/src/mem/physical.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014 ARM Limited
+ * Copyright (c) 2012, 2014, 2018 ARM Limited
  * All rights reserved
  *
  * The license below extends only to copyright in the software and shall
@@ -241,7 +241,7 @@
         return true;
     } else {
         // lookup in the interval tree
-        const auto& r = addrMap.find(addr);
+        const auto& r = addrMap.contains(addr);
         if (r == addrMap.end()) {
             // not in the cache, and not in the tree
             return false;
@@ -298,7 +298,7 @@
     } else {
         // do not update the cache here, as we typically call
         // isMemAddr before calling access
-        const auto& m = addrMap.find(addr);
+        const auto& m = addrMap.contains(addr);
         assert(m != addrMap.end());
         m->second->access(pkt);
     }
@@ -314,7 +314,7 @@
     } else {
         // do not update the cache here, as we typically call
         // isMemAddr before calling functionalAccess
-        const auto& m = addrMap.find(addr);
+        const auto& m = addrMap.contains(addr);
         assert(m != addrMap.end());
         m->second->functionalAccess(pkt);
     }
@@ -406,7 +406,7 @@
     UNSERIALIZE_CONTAINER(lal_addr);
     UNSERIALIZE_CONTAINER(lal_cid);
     for (size_t i = 0; i < lal_addr.size(); ++i) {
-        const auto& m = addrMap.find(lal_addr[i]);
+        const auto& m = addrMap.contains(lal_addr[i]);
         m->second->addLockedAddr(LockedAddr(lal_addr[i], lal_cid[i]));
     }

diff --git a/src/mem/xbar.cc b/src/mem/xbar.cc
index db0bf18..1984a94 100644
--- a/src/mem/xbar.cc
+++ b/src/mem/xbar.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2015 ARM Limited
+ * Copyright (c) 2011-2015, 2018 ARM Limited
  * All rights reserved
  *
  * The license below extends only to copyright in the software and shall
@@ -333,7 +333,7 @@
         return dest_id;

     // Check the address map interval tree
-    auto i = portMap.find(addr);
+    auto i = portMap.contains(addr);
     if (i != portMap.end()) {
         dest_id = i->second;
         updatePortCache(dest_id, i->first);
@@ -420,8 +420,9 @@
             DPRINTF(AddrRanges, "Adding range %s for id %d\n",
                     r.to_string(), master_port_id);
             if (portMap.insert(r, master_port_id) == portMap.end()) {
-                PortID conflict_id = portMap.find(r)->second;
- fatal("%s has two ports responding within range %s:\n\t%s\n\t%s\n",
+                PortID conflict_id = portMap.intersects(r)->second;
+                fatal("%s has two ports responding within range "
+                      "%s:\n\t%s\n\t%s\n",
                       name(),
                       r.to_string(),
                       masterPorts[master_port_id]->getSlavePort().name(),
@@ -496,7 +497,7 @@
             }
         }

-        // also check that no range partially overlaps with the
+        // also check that no range partially intersects with the
         // default range, this has to be done after all ranges are set
         // as there are no guarantees for when the default range is
         // update with respect to the other ones
diff --git a/src/unittest/rangemaptest.cc b/src/unittest/rangemaptest.cc
index 6975f66..88e1c4d 100644
--- a/src/unittest/rangemaptest.cc
+++ b/src/unittest/rangemaptest.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 ARM Limited
+ * Copyright (c) 2012, 2018 ARM Limited
  * All rights reserved
  *
  * The license below extends only to copyright in the software and shall
@@ -59,11 +59,14 @@
     i = r.insert(RangeIn(60, 90), 3);
     assert(i != r.end());

-    i = r.find(RangeIn(20, 30));
+    i = r.intersects(RangeIn(20, 30));
     assert(i != r.end());
     cout << i->first.to_string() << " " << i->second << endl;

-    i = r.find(RangeIn(55, 55));
+    i = r.contains(RangeIn(55, 55));
+    assert(i == r.end());
+
+    i = r.intersects(RangeIn(55, 55));
     assert(i == r.end());

     i = r.insert(RangeIn(0, 12), 1);
@@ -72,7 +75,7 @@
     i = r.insert(RangeIn(0, 9), 1);
     assert(i != r.end());

-    i = r.find(RangeIn(20, 30));
+    i = r.contains(RangeIn(20, 30));
     assert(i != r.end());
     cout << i->first.to_string() << " " << i->second << endl;


--
To view, visit https://gem5-review.googlesource.com/11115
To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings

Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: If3fd3f774a16b27db2df76dc04f1d61824938008
Gerrit-Change-Number: 11115
Gerrit-PatchSet: 1
Gerrit-Owner: Nikos Nikoleris <[email protected]>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev

Reply via email to