From a259b8eeddbcf764b17dd4a12700d0f7578f943a Mon Sep 17 00:00:00 2001 From: jzhou Date: Thu, 2 Sep 2010 17:04:11 +0000 Subject: [PATCH] Clean multicore version code --- .../src/Runtime/{ => bamboo}/GCSharedHash.c | 0 .../src/Runtime/{ => bamboo}/GCSharedHash.h | 0 Robust/src/Runtime/{ => bamboo}/MGCHash.c | 0 Robust/src/Runtime/{ => bamboo}/MGCHash.h | 0 .../Runtime/{ => bamboo}/RAW/Makefile.raw.1 | 0 .../Runtime/{ => bamboo}/RAW/Makefile.raw.2 | 0 .../Runtime/{ => bamboo}/RAW/Makefile.raw.4 | 0 .../Runtime/{ => bamboo}/RAW/Makefile.raw.io | 0 .../Runtime/{ => bamboo}/RAW/raw_dataCache.s | 0 .../Runtime/{ => bamboo}/RAW/raw_interrupt.s | 0 .../Runtime/{ => bamboo}/RAW/raw_interrupt2.s | 0 .../Runtime/{ => bamboo}/RAW/raw_interrupt4.s | 0 .../Runtime/{ => bamboo}/RAW/runtime_arch.h | 0 .../src/Runtime/{ => bamboo}/RAW/task_arch.c | 0 .../Runtime/{ => bamboo}/multicoregarbage.c | 0 .../Runtime/{ => bamboo}/multicoregarbage.h | 0 Robust/src/Runtime/{ => bamboo}/multicoregc.h | 0 .../Runtime/{ => bamboo}/multicorehelper.h | 0 .../Runtime/{ => bamboo}/multicoreruntime.c | 0 .../Runtime/{ => bamboo}/multicoreruntime.h | 0 .../src/Runtime/{ => bamboo}/multicoretask.c | 0 Robust/src/buildscript | 37 ++++++++++--------- 22 files changed, 20 insertions(+), 17 deletions(-) rename Robust/src/Runtime/{ => bamboo}/GCSharedHash.c (100%) rename Robust/src/Runtime/{ => bamboo}/GCSharedHash.h (100%) rename Robust/src/Runtime/{ => bamboo}/MGCHash.c (100%) mode change 100755 => 100644 rename Robust/src/Runtime/{ => bamboo}/MGCHash.h (100%) mode change 100755 => 100644 rename Robust/src/Runtime/{ => bamboo}/RAW/Makefile.raw.1 (100%) rename Robust/src/Runtime/{ => bamboo}/RAW/Makefile.raw.2 (100%) rename Robust/src/Runtime/{ => bamboo}/RAW/Makefile.raw.4 (100%) rename Robust/src/Runtime/{ => bamboo}/RAW/Makefile.raw.io (100%) rename Robust/src/Runtime/{ => bamboo}/RAW/raw_dataCache.s (100%) rename Robust/src/Runtime/{ => bamboo}/RAW/raw_interrupt.s (100%) rename Robust/src/Runtime/{ => bamboo}/RAW/raw_interrupt2.s (100%) rename Robust/src/Runtime/{ => bamboo}/RAW/raw_interrupt4.s (100%) rename Robust/src/Runtime/{ => bamboo}/RAW/runtime_arch.h (100%) rename Robust/src/Runtime/{ => bamboo}/RAW/task_arch.c (100%) rename Robust/src/Runtime/{ => bamboo}/multicoregarbage.c (100%) rename Robust/src/Runtime/{ => bamboo}/multicoregarbage.h (100%) rename Robust/src/Runtime/{ => bamboo}/multicoregc.h (100%) rename Robust/src/Runtime/{ => bamboo}/multicorehelper.h (100%) rename Robust/src/Runtime/{ => bamboo}/multicoreruntime.c (100%) rename Robust/src/Runtime/{ => bamboo}/multicoreruntime.h (100%) rename Robust/src/Runtime/{ => bamboo}/multicoretask.c (100%) diff --git a/Robust/src/Runtime/GCSharedHash.c b/Robust/src/Runtime/bamboo/GCSharedHash.c similarity index 100% rename from Robust/src/Runtime/GCSharedHash.c rename to Robust/src/Runtime/bamboo/GCSharedHash.c diff --git a/Robust/src/Runtime/GCSharedHash.h b/Robust/src/Runtime/bamboo/GCSharedHash.h similarity index 100% rename from Robust/src/Runtime/GCSharedHash.h rename to Robust/src/Runtime/bamboo/GCSharedHash.h diff --git a/Robust/src/Runtime/MGCHash.c b/Robust/src/Runtime/bamboo/MGCHash.c old mode 100755 new mode 100644 similarity index 100% rename from Robust/src/Runtime/MGCHash.c rename to Robust/src/Runtime/bamboo/MGCHash.c diff --git a/Robust/src/Runtime/MGCHash.h b/Robust/src/Runtime/bamboo/MGCHash.h old mode 100755 new mode 100644 similarity index 100% rename from Robust/src/Runtime/MGCHash.h rename to Robust/src/Runtime/bamboo/MGCHash.h diff --git a/Robust/src/Runtime/RAW/Makefile.raw.1 b/Robust/src/Runtime/bamboo/RAW/Makefile.raw.1 similarity index 100% rename from Robust/src/Runtime/RAW/Makefile.raw.1 rename to Robust/src/Runtime/bamboo/RAW/Makefile.raw.1 diff --git a/Robust/src/Runtime/RAW/Makefile.raw.2 b/Robust/src/Runtime/bamboo/RAW/Makefile.raw.2 similarity index 100% rename from Robust/src/Runtime/RAW/Makefile.raw.2 rename to Robust/src/Runtime/bamboo/RAW/Makefile.raw.2 diff --git a/Robust/src/Runtime/RAW/Makefile.raw.4 b/Robust/src/Runtime/bamboo/RAW/Makefile.raw.4 similarity index 100% rename from Robust/src/Runtime/RAW/Makefile.raw.4 rename to Robust/src/Runtime/bamboo/RAW/Makefile.raw.4 diff --git a/Robust/src/Runtime/RAW/Makefile.raw.io b/Robust/src/Runtime/bamboo/RAW/Makefile.raw.io similarity index 100% rename from Robust/src/Runtime/RAW/Makefile.raw.io rename to Robust/src/Runtime/bamboo/RAW/Makefile.raw.io diff --git a/Robust/src/Runtime/RAW/raw_dataCache.s b/Robust/src/Runtime/bamboo/RAW/raw_dataCache.s similarity index 100% rename from Robust/src/Runtime/RAW/raw_dataCache.s rename to Robust/src/Runtime/bamboo/RAW/raw_dataCache.s diff --git a/Robust/src/Runtime/RAW/raw_interrupt.s b/Robust/src/Runtime/bamboo/RAW/raw_interrupt.s similarity index 100% rename from Robust/src/Runtime/RAW/raw_interrupt.s rename to Robust/src/Runtime/bamboo/RAW/raw_interrupt.s diff --git a/Robust/src/Runtime/RAW/raw_interrupt2.s b/Robust/src/Runtime/bamboo/RAW/raw_interrupt2.s similarity index 100% rename from Robust/src/Runtime/RAW/raw_interrupt2.s rename to Robust/src/Runtime/bamboo/RAW/raw_interrupt2.s diff --git a/Robust/src/Runtime/RAW/raw_interrupt4.s b/Robust/src/Runtime/bamboo/RAW/raw_interrupt4.s similarity index 100% rename from Robust/src/Runtime/RAW/raw_interrupt4.s rename to Robust/src/Runtime/bamboo/RAW/raw_interrupt4.s diff --git a/Robust/src/Runtime/RAW/runtime_arch.h b/Robust/src/Runtime/bamboo/RAW/runtime_arch.h similarity index 100% rename from Robust/src/Runtime/RAW/runtime_arch.h rename to Robust/src/Runtime/bamboo/RAW/runtime_arch.h diff --git a/Robust/src/Runtime/RAW/task_arch.c b/Robust/src/Runtime/bamboo/RAW/task_arch.c similarity index 100% rename from Robust/src/Runtime/RAW/task_arch.c rename to Robust/src/Runtime/bamboo/RAW/task_arch.c diff --git a/Robust/src/Runtime/multicoregarbage.c b/Robust/src/Runtime/bamboo/multicoregarbage.c similarity index 100% rename from Robust/src/Runtime/multicoregarbage.c rename to Robust/src/Runtime/bamboo/multicoregarbage.c diff --git a/Robust/src/Runtime/multicoregarbage.h b/Robust/src/Runtime/bamboo/multicoregarbage.h similarity index 100% rename from Robust/src/Runtime/multicoregarbage.h rename to Robust/src/Runtime/bamboo/multicoregarbage.h diff --git a/Robust/src/Runtime/multicoregc.h b/Robust/src/Runtime/bamboo/multicoregc.h similarity index 100% rename from Robust/src/Runtime/multicoregc.h rename to Robust/src/Runtime/bamboo/multicoregc.h diff --git a/Robust/src/Runtime/multicorehelper.h b/Robust/src/Runtime/bamboo/multicorehelper.h similarity index 100% rename from Robust/src/Runtime/multicorehelper.h rename to Robust/src/Runtime/bamboo/multicorehelper.h diff --git a/Robust/src/Runtime/multicoreruntime.c b/Robust/src/Runtime/bamboo/multicoreruntime.c similarity index 100% rename from Robust/src/Runtime/multicoreruntime.c rename to Robust/src/Runtime/bamboo/multicoreruntime.c diff --git a/Robust/src/Runtime/multicoreruntime.h b/Robust/src/Runtime/bamboo/multicoreruntime.h similarity index 100% rename from Robust/src/Runtime/multicoreruntime.h rename to Robust/src/Runtime/bamboo/multicoreruntime.h diff --git a/Robust/src/Runtime/multicoretask.c b/Robust/src/Runtime/bamboo/multicoretask.c similarity index 100% rename from Robust/src/Runtime/multicoretask.c rename to Robust/src/Runtime/bamboo/multicoretask.c diff --git a/Robust/src/buildscript b/Robust/src/buildscript index 4c943b1e..a0d05e25 100755 --- a/Robust/src/buildscript +++ b/Robust/src/buildscript @@ -631,6 +631,8 @@ done BUILDDIR="$CURDIR/$tmpbuilddirectory" +BAMBOORUNTIME=$ROBUSTROOT/Runtime/bamboo + cd $1 cd $CURDIR shift @@ -789,15 +791,15 @@ else MAKEFILE="$MAKEFILE.$RAWCONFIG" fi #useio version -cp $ROBUSTROOT/Runtime/RAW/$MAKEFILE ./Makefile +cp $BAMBOORUNTIME/RAW/$MAKEFILE ./Makefile cp ../Runtime/*.c ./ cp ../Runtime/*.h ./ cp ../Runtime/*.S ./ cp ../Runtime/*.s ./ -cp ../Runtime/RAW/*.c ./ -cp ../Runtime/RAW/*.h ./ -cp ../Runtime/RAW/*.S ./ -cp ../Runtime/RAW/*.s ./ +cp $BAMBOORUNTIME/RAW/*.c ./ +cp $BAMBOORUNTIME/RAW/*.h ./ +cp $BAMBOORUNTIME/RAW/*.S ./ +cp $BAMBOORUNTIME/RAW/*.s ./ cp ../$tmpbuilddirectory/*.c ./ cp ../$tmpbuilddirectory/*.h ./ @@ -980,33 +982,33 @@ else cp $ROBUSTROOT/Tilera/Runtime/$TILERA_INDIR/bamboo-vmlinux-pci.hvc ./bamboo-vmlinux-pci.hvc fi fi -cp ../Runtime/multicoretask.c ./ -cp ../Runtime/multicoreruntime.c ./ cp ../Runtime/Queue.c ./ cp ../Runtime/file.c ./ cp ../Runtime/math.c ./ cp ../Runtime/object.c ./ cp ../Runtime/GenericHashtable.c ./ cp ../Runtime/SimpleHash.c ./ -cp ../Runtime/GCSharedHash.c ./ cp ../Runtime/ObjectHash.c ./ cp ../Runtime/socket.c ./ cp ../Runtime/mem.c ./ -cp ../Runtime/multicoregarbage.c ./ -cp ../Runtime/MGCHash.c ./ cp ../Runtime/GenericHashtable.h ./ cp ../Runtime/mem.h ./ -cp ../Runtime/multicoreruntime.h ./ cp ../Runtime/object.h ./ cp ../Runtime/ObjectHash.h ./ cp ../Runtime/Queue.h ./ cp ../Runtime/runtime.h ./ cp ../Runtime/SimpleHash.h ./ -cp ../Runtime/GCSharedHash.h ./ -cp ../Runtime/multicoregc.h ./ -cp ../Runtime/multicoregarbage.h ./ -cp ../Runtime/multicorehelper.h ./ -cp ../Runtime/MGCHash.h ./ +cp $BAMBOORUNTIME/multicoretask.c ./ +cp $BAMBOORUNTIME/multicoreruntime.c ./ +cp $BAMBOORUNTIME/GCSharedHash.c ./ +cp $BAMBOORUNTIME/multicoregarbage.c ./ +cp $BAMBOORUNTIME/MGCHash.c ./ +cp $BAMBOORUNTIME/multicoreruntime.h ./ +cp $BAMBOORUNTIME/GCSharedHash.h ./ +cp $BAMBOORUNTIME/multicoregc.h ./ +cp $BAMBOORUNTIME/multicoregarbage.h ./ +cp $BAMBOORUNTIME/multicorehelper.h ./ +cp $BAMBOORUNTIME/MGCHash.h ./ cp ../Tilera/Runtime/*.c ./ cp ../Tilera/Runtime/*.h ./ cp ../Tilera/Runtime/$TILERA_INDIR/*.c ./ @@ -1033,7 +1035,8 @@ INCLUDES="$INCLUDES -I$ROBUSTROOT/Runtime -I. -IRuntime/include \ if $MULTICOREFLAG then -RUNTIMEFILE="$ROBUSTROOT/Runtime/multicoreruntime.c $ROBUSTROOT/Runtime/multicoretask.c" +RUNTIMEFILE="$BAMBOORUNTIME/multicoreruntime.c $BAMBOORUNTIME/multicoretask.c" +INCLUDES="$INCLUDES -I$BAMBOORUNTIME" else RUNTIMEFILE="$ROBUSTROOT/Runtime/runtime.c $ROBUSTROOT/Runtime/task.c" fi -- 2.34.1