integrating recent changes from fermi-test into fermi

(i'll use "fermi" for more disruptive changes to the pipeline model such
as updating the MSHRs and getting rid of the warp tracker, ripping out DWF, etc...)

[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 7805]

1 files changed, 0 insertions, 30 deletions

diff --git a/benchmarks/CUDA/MUM/morton.c b/benchmarks/CUDA/MUM/morton.c
deleted file mode 100644
index 13599c6..0000000
--- a/benchmarks/CUDA/MUM/morton.c
+++ /dev/null
@@ -1,30 +0,0 @@
-#include <stdio.h>
-
-void morton(int i, int *x, int *y)
-{
-  *x = 0;
-  *y = 0;
-
-  int b;
-  for (b = 0; b < 16; b++)
-  {
-    *x |= (i & (1 << (b*2)))     >> b;
-    *y |= (i & (1 << (b*2+1))) >> (b+1);
-  }
-}
-
-int main(int argc, char ** argv)
-{
-  int i;
-  for (i = 0; i < 100; i++)
-  {
-    int x;
-    int y;
-
-    morton(i,&x,&y);
-
-    printf("%d: %d %d\n", i, x, y);
-  }
-
-  return 0;
-}