summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorDongdong Li <[email protected]>2013-11-22 11:32:14 -0800
committerAndrew Boktor <[email protected]>2014-08-14 13:50:59 -0700
commitbdc0e550448f04c7c8f030b7421209bae37e651d (patch)
treed59135ebbc05d7ddcd77c3b647e647e159073359 /README
parent3f74773ce1ffe8ed5044a103d84459b56d4e9c20 (diff)
Add .svn file so other people can keep update with changes from Stanford
Code Review: Issue 103001 [git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 17411]
Diffstat (limited to 'README')
-rw-r--r--README28
1 files changed, 27 insertions, 1 deletions
diff --git a/README b/README
index d0c1a51..0fb8a70 100644
--- a/README
+++ b/README
@@ -281,7 +281,7 @@ benchmarks now contains updated instructions for running the benchmarks on
GPGPU-Sim v3.x.
-4. (OPTIONAL) Updating GPGPU-Sim (ADVANCED USERS ONLY)
+3. (OPTIONAL) Updating GPGPU-Sim (ADVANCED USERS ONLY)
If you have made modifications to the simulator and wish to incorporate new
features/bugfixes from subsequent releases the following instructions may help.
@@ -328,6 +328,8 @@ to open a graphical merge tool to do the merge:
git mergetool
+3.1 Testing updated version of GPGPU-Sim
+
Now you should test that the merged version "works". This means following the
steps for building GPGPU-Sim in the *new* README file (not this version) since
they may have changed. Assuming the code compiles without errors/warnings the
@@ -340,5 +342,29 @@ before you did the merge). You want to do this before making further changes to
identify any compile time or runtime errors that occur due to the code merging
process.
+3.2 (OPTIONAL) Updating Intersim2 (ADVANCED USERS ONLY)
+
+Booksim 2.0 is maintained by the Concurrent VLSI Architecture group at Stanford
+(https://nocs.stanford.edu/cgi-bin/trac.cgi/wiki/Resources/BookSim). Intersim2
+is Booksim 2.0 with extentions. Booksim 2.0 is still under active development,
+with updates that usually bring cutting edge features and bug fixes. If you want
+these new features or bug fixes, it is possible to pull updates from Booksim 2.0
+ server and apply the updates to Intersim2. You can follow the instructions
+below to update Intersim2 with the new Booksim 2.0.
+
+As above, YOU SHOULD BACKUP YOUR CHANGES BEFORE PROCEEDING.
+
+The Booksim 2.0 uses svn source control. First, go to the Intersim2 root
+directory($GPGPUSIM_ROOT/src/intersim2) in the terminal. Then, run the
+following command in terminal:
+
+svn update
+While svn is updating your local copy of Intersim2 with the latest changes from
+the Booksim 2.0 svn server, conflicts might arise due to changes that either we
+or you made that conflict with the latest updates. In this case, svn will prompt
+you to edit conflict files using default text editor or you can postpone it and
+then using your favorite merge tool to resolve conflict files.
+After you updated Intersim2, you should test the merged version through the
+instructions described in Section 3.1.