Remove old files.
authorDavid Terei <davidterei@gmail.com>
Thu, 12 Jan 2012 22:51:12 +0000 (14:51 -0800)
committerDavid Terei <davidterei@gmail.com>
Thu, 12 Jan 2012 22:51:12 +0000 (14:51 -0800)
24 files changed:
.darcs-boring [deleted file]
GHC_ONLY/bugs/record_upd/Main.hs [deleted file]
GHC_ONLY/bugs/record_upd/Makefile [deleted file]
GHC_ONLY/bugs/record_upd/record_upd.stdout [deleted file]
GHC_ONLY/bugs/strict_anns/Main.hs [deleted file]
GHC_ONLY/bugs/strict_anns/Makefile [deleted file]
GHC_ONLY/bugs/strict_anns/strict_anns.stdout [deleted file]
PATCHLEVEL [deleted file]
README
UNUSED/Makefile [deleted file]
UNUSED/nfib/Main.hs [deleted file]
UNUSED/nfib/Makefile [deleted file]
UNUSED/nfib/nfib.m [deleted file]
UNUSED/nfib/nfib.stdout [deleted file]
UNUSED/nfib_overloaded/Main.hs [deleted file]
UNUSED/nfib_overloaded/Makefile [deleted file]
UNUSED/nfib_overloaded/nfib_overloaded.stdout [deleted file]
distributed/GdH/Distributed.hs [deleted file]
distributed/README [deleted file]
distributed/chain/chain.hs [deleted file]
distributed/error/error.hs [deleted file]
distributed/names/names.hs [deleted file]
distributed/place/place.hs [deleted file]
mkworld/only4-nofib-ghc.jm [deleted file]

diff --git a/.darcs-boring b/.darcs-boring
deleted file mode 100644 (file)
index 99738d2..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-# Boring file regexps:
-\.o$
-\.o\.cmd$
-# *.ko files aren't boring by default because they might
-# be Korean translations rather than kernel modules.
-# \.ko$
-\.ko\.cmd$
-\.mod\.c$
-(^|/)\.tmp_versions($|/)
-(^|/)CVS($|/)
-(^|/)RCS($|/)
-~$
-#(^|/)\.[^/]
-(^|/)_darcs($|/)
-\.bak$
-\.BAK$
-\.orig$
-(^|/)vssver\.scc$
-\.swp$
-(^|/)MT($|/)
-(^|/)\{arch\}($|/)
-(^|/).arch-ids($|/)
-(^|/),
-\.class$
-\.prof$
-(^|/)\.DS_Store$
-(^|/)BitKeeper($|/)
-(^|/)ChangeSet($|/)
-(^|/)\.svn($|/)
-\.py[co]$
-\#
-\.cvsignore$
-(^|/)Thumbs\.db$
-^PRIVATE
diff --git a/GHC_ONLY/bugs/record_upd/Main.hs b/GHC_ONLY/bugs/record_upd/Main.hs
deleted file mode 100644 (file)
index 3b6b3ae..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-{-     The purpose of this is to test that record update is
-       sufficiently polymorphic.  See comments with
-       tcExpr (RecordUpd) in TcExpr.lhs
--}
-
-module Main where
-
-data T a b c d  = MkT1 { op1 :: a, op2 :: b }
-              | MkT2 { op1 :: a, op3 :: c }
-              | MkT3 { op4 :: a, op5 :: d }
-
-update1 :: a2 -> T a b c d -> T a2 b c d2
-update1 x t = t { op1 = x }
-       -- NB: the MkT3.op4 case doesn't constrain the result because
-       -- it doesn't have an op1 field
-
-update2 :: a2 -> T a b c d -> T a2 b2 c2 d
-update2 x t = t { op4 = x }
-
-main = print (op4 $ 
-             update2 True $ 
-             MkT3 { op4 = op2 $
-                          update1 (1::Int) $
-                          MkT1 { op1 = True }
-             })
diff --git a/GHC_ONLY/bugs/record_upd/Makefile b/GHC_ONLY/bugs/record_upd/Makefile
deleted file mode 100644 (file)
index 912c687..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-TOP = ../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/target.mk
-
diff --git a/GHC_ONLY/bugs/record_upd/record_upd.stdout b/GHC_ONLY/bugs/record_upd/record_upd.stdout
deleted file mode 100644 (file)
index 0ca9514..0000000
+++ /dev/null
@@ -1 +0,0 @@
-True
diff --git a/GHC_ONLY/bugs/strict_anns/Main.hs b/GHC_ONLY/bugs/strict_anns/Main.hs
deleted file mode 100644 (file)
index b2ee82d..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
--- This test checks that constructors with strictness annotations
--- at least parse correctly.  In GHC 2.02 they didn't!
-
-module Main where
-data Foo1 = Crunch1 ! Int ! Int Int deriving( Show )
-
-data Foo2 = Crunch2 ! Int Int Int   deriving( Show )
-
-main = do
-       print (Crunch1 (1+1) (2+2) (3+3))
-       print (Crunch2 (1+1) (2+2) (3+3))
-  
diff --git a/GHC_ONLY/bugs/strict_anns/Makefile b/GHC_ONLY/bugs/strict_anns/Makefile
deleted file mode 100644 (file)
index 912c687..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-TOP = ../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/target.mk
-
diff --git a/GHC_ONLY/bugs/strict_anns/strict_anns.stdout b/GHC_ONLY/bugs/strict_anns/strict_anns.stdout
deleted file mode 100644 (file)
index 0f6e62e..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-Crunch1 2 4 6
-Crunch2 2 4 6
diff --git a/PATCHLEVEL b/PATCHLEVEL
deleted file mode 100644 (file)
index 1689f3d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-The NoFib Haskell benchmark suite, version 2.01, patchlevel 0
diff --git a/README b/README
index 587ec73..a299d76 100644 (file)
--- a/README
+++ b/README
@@ -29,3 +29,4 @@ you'll need to get hold of Cachegrind, which is part of Valgrind
 
 There are some options you might want to tweak; search for nofib in
 ../mk/config.mk, and override settings in ../mk/build.mk as usual.
+
diff --git a/UNUSED/Makefile b/UNUSED/Makefile
deleted file mode 100644 (file)
index ce1d091..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-TOP = ../..
-include $(TOP)/mk/boilerplate.mk
-SUBDIRS = nfib nfib_overloaded
-include $(TARGET_MK)
diff --git a/UNUSED/nfib/Main.hs b/UNUSED/nfib/Main.hs
deleted file mode 100644 (file)
index b7f9b29..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
---!!! the ultra-notorious "nfib 30"
---
-module Main (main) where
-
-main = print (nfib 30)
-
-nfib :: Int -> Int
-nfib n = if n <= 1 then 1 else nfib (n-1) + nfib (n-2) + 1
diff --git a/UNUSED/nfib/Makefile b/UNUSED/nfib/Makefile
deleted file mode 100644 (file)
index cf44ea3..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-TOP = ../..
-include $(TOP)/mk/boilerplate.mk
--include opts.mk
-include $(TOP)/mk/target.mk
-
diff --git a/UNUSED/nfib/nfib.m b/UNUSED/nfib/nfib.m
deleted file mode 100644 (file)
index acd4eea..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-nfib n = 1, n<= 1
-       = 1 + nfib (n-1) + nfib (n-2), otherwise
diff --git a/UNUSED/nfib/nfib.stdout b/UNUSED/nfib/nfib.stdout
deleted file mode 100644 (file)
index f108de6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-2692537
diff --git a/UNUSED/nfib_overloaded/Main.hs b/UNUSED/nfib_overloaded/Main.hs
deleted file mode 100644 (file)
index b34fe05..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
---!!! the ultra-notorious "nfib 30" (overloaded arithmetic)
---
-module Main (main) where
-
-main = print (nfib 30)
-
-nfib 0 = 1
-nfib 1 = 1
-nfib n = nfib (n - 2) + nfib (n - 1) + 1
diff --git a/UNUSED/nfib_overloaded/Makefile b/UNUSED/nfib_overloaded/Makefile
deleted file mode 100644 (file)
index cf44ea3..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-TOP = ../..
-include $(TOP)/mk/boilerplate.mk
--include opts.mk
-include $(TOP)/mk/target.mk
-
diff --git a/UNUSED/nfib_overloaded/nfib_overloaded.stdout b/UNUSED/nfib_overloaded/nfib_overloaded.stdout
deleted file mode 100644 (file)
index f108de6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-2692537
diff --git a/distributed/GdH/Distributed.hs b/distributed/GdH/Distributed.hs
deleted file mode 100644 (file)
index 7f214bc..0000000
+++ /dev/null
@@ -1,195 +0,0 @@
--- Now you want to recompile Channel,ChannelVar, Merge,SampleVar,Semaphore 
---  to use this module rather than the the Concurrent module...
-
--- I ignore the fact that the file handling stuff needs MVars too, so maybe
---   we should be replacing PrelConc in the longrun! The dependencies will be
---   fun to sort out though.
-
-module Distributed
-(        PEId                  -- abstract
-        , Immobile             -- abstract class
-       , myPEId                -- :: IO PEId
-       , allPEId               -- :: IO [PEId]
-       , owningPE              -- :: a -> IO PEId
-       , revalIO               -- :: IO a -> b -> IO a -- (b is PEId, MVar, ThreadId)
-
-       , on                    -- :: a -> PEId -> a
-       , mainPE                -- :: PEId
-
-       , ThreadId              -- abstract
-       , killThread            -- :: ThreadId -> IO ()
-       , raiseInThread         -- :: ThreadId -> Exception -> IO ()
-       , yield                 -- :: IO ()
-       , threadDelay           -- :: Int -> IO ()
-       , myThreadId            -- :: IO ThreadId
-       , forkIO                -- :: IO () -> IO ThreadId
-       , rforkIO               -- :: IO () -> PEId -> IO ThreadId
-
-       , MVar                  -- abstract
-       , newMVar               -- :: a -> IO (MVar a)
-       , newEmptyMVar          -- :: IO (MVar a)
-       , takeMVar              -- :: MVar a -> IO a
-       , putMVar               -- :: MVar a -> a -> IO ()
-       , readMVar              -- :: MVar a -> IO a
-        , swapMVar             -- :: MVar a -> a -> IO a
-        , isEmptyMVar          -- :: MVar a -> IO Bool
-       , tryPutMVar            -- :: MVar a -> a -> IO Bool
-       , takeMaybeMVar         -- :: MVar a -> IO (Maybe a) 
-) where
-
-import PrelDistributed
-
-import Concurrent (ThreadId, MVar, forkIO, yield, threadDelay, myThreadId, newMVar, newEmptyMVar)
-import qualified Concurrent
-import qualified PrelConc
-
-import Exception ( Exception(..),ArithException(..), AsyncException(..))
-import qualified Exception
-
-import PrelPack (packString)
-import qualified PrelIOBase
-import PrelAddr (Addr)
-
----------------------------
--- basic PEId stuff
-
-myPEId :: IO PEId
-myPEId = do
-       p <- _ccall_ cGetMyPEId
-       return (PEId p)
-
-allPEId        :: IO [PEId]
-allPEId = do
-       (cnt :: Int) <- _ccall_ cGetPECount
-       let getPE (n :: Int) = do
-               p <- _ccall_ cGetPEId n
-               return (PEId p) 
-       mapM getPE [1..cnt]
-       
-instance Show PEId where
-  showsPrec _ (PEId p) s = ("PE:"++(show p)) ++ s 
-                               
----------------------------
--- basic immobile resources stuff
-
-class Immobile a where
-  owningPE :: a -> IO PEId
-  revalIO :: IO b -> a -> IO b
-
-  revalIO job x = do
-       p <- owningPE x
-       doRevalIO job p 
-
-  owningPE x = primGetCertainOwner x
-
-
--- General GpH Problems:
---  1 - signal handlers not installed... so can't catch div-by-zero yet
-data Status a = Okay a | Fail Exception
-
-doRevalIO :: IO a -> PEId -> IO a
-doRevalIO job p = do
-       i <- myPEId     
-       if p==i
-         then job              -- keep it simple if its local
-         else do                       
-               primRevalIO result p 
-
-               -- block until we know the result is Okay or not. 
-               case result of
-                 Okay r -> return r
-                 Fail e -> Exception.throw e
-
-       where   
-         -- we wrap job up to return an 'okay' result.
-         okayJob = do 
-               r <- job
-               return (Okay r)
-
-         -- if something goes wrong we return a 'Fail' result.
-         safeJob = Exception.catch okayJob (\e -> return (Fail e))
-
-         -- we return the result via a single variable so we can
-         --  use GpH's synchronisation mechanisms ie FETCHME, BQ, etc. (hackity, hack.)
-         result = PrelIOBase.unsafePerformIO safeJob
-       
----------------------------
--- utility functions
-
-on :: a -> PEId -> a
-on x p = PrelIOBase.unsafePerformIO (revalIO (x `seq` return x) p)
-
-mainPE :: PEId
-mainPE = (PEId (PrelIOBase.unsafePerformIO (_ccall_ cGetPEId (1::Int))))
-
----------------------------
--- immobile PEIds - well it fits in nicely :)
-
-instance Immobile PEId where 
-  owningPE p = return p 
-
----------------------------
--- immobile MVars 
-
-instance Immobile (MVar a)
-
----------------------------
--- immobile ThreadIds
-
--- The big issue is should the reval thread have the same threadId as its parent?
--- I think we should say NO! If you want to know your parents Id then let the 
---   programmer pass it explicitly. Why make my life hard!
--- This opinion could require rethinking later...
-
-instance Immobile ThreadId
-
----------------------------
--- immobile Host Names (RFP playing around)
-
-instance Immobile ([Char]) where 
-  owningPE h = do
-       p <- _ccall_ cGetHostOwner (packString h)       
-       case p of
-         0 -> error "no such host"
-         _ -> return (PEId p) 
-         
----------------------------
--- forking stuff
-
-rforkIO                :: IO () -> PEId -> IO ThreadId
-rforkIO job p          = revalIO (forkIO job) p
-
----------------------------
--- killing
-
-killThread             :: ThreadId -> IO ()
-killThread th          = revalIO (Concurrent.killThread th) th
-
-raiseInThread          :: ThreadId -> Exception -> IO ()
-raiseInThread th ex    = revalIO (Concurrent.raiseInThread th ex) th
-
----------------------------
--- MVAR primitives  
-
-takeMVar               :: MVar a -> IO a
-takeMVar mv            = revalIO (Concurrent.takeMVar mv) mv
-
-putMVar                        :: MVar a -> a -> IO ()
-putMVar        mv r            = revalIO (Concurrent.putMVar mv r) mv
-
-readMVar               :: MVar a -> IO a
-readMVar mv            = revalIO (Concurrent.readMVar mv) mv
-
-swapMVar               :: MVar a -> a -> IO a
-swapMVar mv r          = revalIO (Concurrent.swapMVar mv r) mv
-
-isEmptyMVar            :: MVar a -> IO Bool
-isEmptyMVar mv         = revalIO (Concurrent.isEmptyMVar mv) mv
-
-tryPutMVar             :: MVar a -> a -> IO Bool 
-tryPutMVar mv r                = Exception.catch (do;putMVar mv r;return True) (\e->return False) 
-
-takeMaybeMVar          :: MVar a -> IO (Maybe a)
-takeMaybeMVar mv       = revalIO (PrelConc.takeMaybeMVar mv) mv
-
diff --git a/distributed/README b/distributed/README
deleted file mode 100644 (file)
index 5f420b7..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-Time-stamp: <Tue Apr 03 2001 01:37:07 Stardate: [-30]6425.12 hwloidl>
-
-This directory contains very simple GdH test programs.
-GdH, Glasgow distributed Haskell, is an extension of Haskell98 for executing
-programs on a network of machines, each running an instance of the 
-distributed runtime-system (RTS). The RTS ("sticky GUM") is an extension
-of the parallel RTS (GUM) adding explicit task placement. GdH uses
-a virtual shared heap and implicit communication. For more details see
-  http://www.cee.hw.ac.uk/~dsg/gdh
-
-At the moment GdH is still in an experimental stage.
-The compiler should know about a way "md" for building the distributed
-version of the RTS (no modifications in the compiler are necessary).
-
-This whole subdir needs integration into the nofib build machinery.
-At the moment they are standalone makefiles.
-If you want to play with them:
-- Do a make all in the GdH dir for building modified versions of some 
-  libraries.
-- Go into one of the other dirs, containing one file test programs, and 
-  do a make (prbly have to add -i../GdH)
diff --git a/distributed/chain/chain.hs b/distributed/chain/chain.hs
deleted file mode 100644 (file)
index 63f11b2..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-module Main(main) where
-
-import Distributed
-import System.Environment
-import System.IO
-
-       
-data Link a = Link (MVar a) (MVar ())
-
-instance Immobile (Link a) where 
-  owningPE (Link i o) = owningPE i
-
-newLink :: IO (Link a)
-newLink = do
-       i <- newEmptyMVar
-       o <- newMVar ()
-       return (Link i o)
-
-readLink :: Link a -> IO a
-readLink (Link i o) = do
-       v <- takeMVar i
-       putMVar o ()
-       return v
-
-writeLink :: Link a -> a -> IO ()
-writeLink (Link i o) v = do
-       takeMVar o
-       putMVar i v
-
-               
-main = do 
-       putStrLn "Chain..."
-       pes <- allPEId
-
-       o <- newLink
-       
-       let spawn p = do
-               i <- newLink
-               let work = do
-                       v <- readLink i
-                       writeLink o ((v*2),p)
-                       work
-               forkIO work
-               return i
-
-       is <- mapM (\p -> revalIO (spawn p) p) pes
-
-       let 
-         work 0 = return True
-         work n = do
-               writeLink (is!!(n `mod` (length is))) n
-               (v,p) <- readLink o
-               if v==(n*2)
-                 then do
-                       putStrLn "Okay"
-                       work (n-1)
-                 else do
-                       putStrLn ("ERROR: "++show p++" says 2*"++show n++"="++ show v)
-                       return False
-
-       rs <- work ((length pes)*6)
-       if rs 
-          then putStrLn "Test PASSED" 
-          else putStrLn "Test FAILED"
-        return ()
-
-{-
-
-*Creates a slave thread on each PE which has the job of reading a number and returning
- double the result.
-
-*Tests MVar communication, and thread creation.
-
--}     
diff --git a/distributed/error/error.hs b/distributed/error/error.hs
deleted file mode 100644 (file)
index 61c7d74..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-module Main(main) where
-
-import Distributed
-import System
-import Exception
-               
-main = do  
-       putStrLn "Error test..."
-       pes <- allPEId
-       m <- newEmptyMVar
-
-       let 
-         work p = catch (revalIO remote p) fails         
-         remote = do
-               i  <- myPEId
-               mo <- owningPE m
-               putMVar m (if i==mo then "Owner" else "Other")
-               return True
-         fails PutFullMVar = do
-               name <- takeMVar m
-               putStrLn ("Writer= "++name)
-               return True
-         fails e = do
-               putStrLn ("Error: "++show e)
-               return False
-
-       rs <- mapM work pes     
-       catch (putMVar m "Main") (\e-> return ())
-       name <- takeMVar m
-       putStrLn ("Writer= "++name)
-
-       if rs==(replicate (length pes) True) 
-          then putStrLn "Test PASSED" 
-          else putStrLn "Test FAILED"
-
-
-{-
-
-* tests the handling of remote exceptions.
-
--}
\ No newline at end of file
diff --git a/distributed/names/names.hs b/distributed/names/names.hs
deleted file mode 100644 (file)
index bb12f66..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-module Main(main) where
-
-import Distributed
-import System.Environment
-import Data.List
-import System.IO
-import System.Time 
-import PrelNum
-
--- we are only interested in ms accuracy < 60 seconds
-runTime :: ClockTime -> ClockTime -> Int
-runTime t1 t2 = 
-       let
-         TimeDiff _ _ d h m s p = diffClockTimes t1 t2
-         (dp,mp) = divModInteger p 1000000000
-         b = integer2Int dp
-         (nb,es) = if(b<0) then (b+1000,s-1) else (b,s)
-         ns  = if(es<0) then es+60 else es
-       in  nb+1000*ns 
-
-
-timeit :: IO a -> IO (a, Int)
-timeit job = do
-       start <- getClockTime
-       res <- job
-       done <- getClockTime
-       return (res,(runTime done start))
-                       
-type PeNames = [(PEId,[String])]
-
-host2pe :: PeNames -> String -> PEId
-host2pe pns n = 
-       case (filter (\(p,xs) -> elem n xs) pns) of
-         [(p,_)] -> p
-         _       -> error "unknown Host"
-
-pe2host :: PeNames -> PEId -> String
-pe2host pns t =
-       case (filter (\(p,xs) -> p==t) pns) of
-         [(_,h:_)] -> h
-         _         -> error "unknown PEId"
-
-peNames :: IO PeNames
-peNames = do
-       pes@(m:_) <- allPEId
-       
-       let work p = do
-               n <- revalIO (getEnv "HOST") p
-               return (p,n)
-
-       ws <- mapM work pes
-       
-       let
-         us = map (\n -> (n,0)) (nub (map (\(_,n)->n) ws))
-
-         reduce = foldl (\acc (t,x) -> if t then (acc++[x]) else acc) []
-
-         unique (us,acc) (p,n) = (nus,acc++[(p,nn)])
-               where 
-                 (nus,nn) = loop us
-                 loop ((x,c):t) = 
-                       if x==n
-                         then ((x,c+1):t, reduce [(p==m,"MainPE"),(c==0,x),(True,(show c)++"@"++x)])
-                         else let (rt,rn) = (loop t) in ((x,c):rt,rn)
-       
-         (_,ns) = foldl unique (us,[]) ws
-       return ns
-        
-main = do 
-       pes <- allPEId
-
-       putStrLn "PE Names..."
-       ns <- peNames
-       mapM (\x -> putStrLn (show x)) ns 
-
-       putStrLn "\nTiming..."
-       let     
-         timePing p = do
-               putStr ("Pinging "++(pe2host ns p)++" ... ")
-               (_,ms) <- timeit (revalIO (return ()) p)
-               putStrLn (" time="++show ms++"ms")
-       mapM timePing pes
-
-       return ()
-
-
-{-
-
-* Generates unique and meaningful names for each PE, then times communication.
-
-* Tests remote host lookup and timing.
-
--}
diff --git a/distributed/place/place.hs b/distributed/place/place.hs
deleted file mode 100644 (file)
index 6ed5fa9..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-import Distributed
-import System.Environment
-import System.IO
-
-main = do 
-       putStrLn "Place Test..."
-
-       pes <- allPEId
-
-       let
-         tot = length pes
-
-         check mv = do
-               i <- myPEId
-               o <- owningPE mv
-               return (i,o)
-         same = map (\(x,y) -> x==y)
-       
-         test n = (replicate n False)++[True]++(replicate (tot-1-n) False)
-
-         loop n = do
-               let pe = pes!!n
-               mv <- revalIO (newEmptyMVar) pe
-               rs <- mapM (\p -> revalIO (check mv) p) pes
-               if (same rs)==(test n)
-                 then do
-                       putStrLn "Okay"
-                       return True
-                 else do
-                       putStrLn ("ERROR: MVar should be located at "++show pe ++". Results "++show rs) 
-                       return False    
-                               
-       rs <- mapM loop [0..tot-1]
-
-       if rs==(replicate tot True) 
-         then putStrLn "Test PASSED" 
-         else putStrLn "Test FAILED"
-       return ()
-
-{-
-
-* Creates an MVar on each PE and then checks that it can be correctly
-  located from all other PEs.
-
-* Tests owningPE on MVars.
-
--}
diff --git a/mkworld/only4-nofib-ghc.jm b/mkworld/only4-nofib-ghc.jm
deleted file mode 100644 (file)
index 0afae53..0000000
+++ /dev/null
@@ -1,260 +0,0 @@
-#ifndef GhcVersionInUse
-# define GhcVersionInUse 27
-#endif
-
-#if GhcVersionInUse >= 19
-# define if19plus(x) x
-#else
-# define if19plus(x) /*nothing*/
-#endif
-
-#if GhcVersionInUse >= 24
-# define if24plus(x) x
-#else
-# define if24plus(x) /*nothing*/
-#endif
-
-#if GhcVersionInUse >= 27
-# define if27plus(x) x
-#else
-# define if27plus(x) /*nothing*/
-#endif
-
-MKDEPENDHS_OPTS= -irequired:glaExts:ghc
-
-/* these flags worked all the way back to 0.10: */
-#define _Hm(n) CAT3(-Rmax-heapsize,n,000000)
-#define _Km(n) CAT3(-Rmax-stksize,n,000000)
-#define _Kk(n) CAT3(-Rmax-stksize,n,000)
-HC_OPTS_anna   = _Hm(16)
-HC_OPTS_anna_BaseDefs = -cpp
-
-HC_OPTS_bspt_BSPT      = if27plus(-fno-all-strict)
-HC_OPTS_bspt_Euclid    = if27plus(-fno-all-strict)
-HC_OPTS_bspt_EuclidGMS = if27plus(-fno-all-strict)
-HC_OPTS_bspt_GeomNum   = if27plus(-fno-all-strict) -cpp
-HC_OPTS_bspt_Init      = if27plus(-fno-all-strict)
-HC_OPTS_bspt_Input     = if27plus(-fno-all-strict) _Hm(24)
-HC_OPTS_bspt_Interface = if27plus(-fno-all-strict)
-HC_OPTS_bspt_Interpret = if27plus(-fno-all-strict)
-HC_OPTS_bspt_Libfuns   = if27plus(-fno-all-strict)
-HC_OPTS_bspt_MGRlib    = if27plus(-fno-all-strict)
-HC_OPTS_bspt_Main      = if27plus(-fno-all-strict) -cpp
-HC_OPTS_bspt_Merge     = if27plus(-fno-all-strict)
-HC_OPTS_bspt_Params    = if27plus(-fno-all-strict)
-HC_OPTS_bspt_Prog      = if27plus(-fno-all-strict) -cpp
-HC_OPTS_bspt_Rationals = if27plus(-fno-all-strict)
-HC_OPTS_bspt_Render    = if27plus(-fno-all-strict)
-HC_OPTS_bspt_Stdlib    = if27plus(-fno-all-strict)
-
-HC_OPTS_compress_Encode  = -cpp _Hm(12)
-HC_OPTS_compress2 = -cpp if19plus(-syslib hbc)
-HC_OPTS_compress2_WriteRoutines = if24plus(-monly-4-regs)
-NOFIB_RUN_compress2 = +RTS -H16m -RTS
-
-HC_OPTS_fluid  = _Hm(12)
-HC_OPTS_fluid_Main = -cpp
-
-HC_OPTS_gg     = _Hm(12)
-
-HC_OPTS_HMMS   = if19plus(-syslib hbc)
-HC_OPTS_HMMS_MaybeStateT = -cpp
-HC_OPTS_HMMS_BatchAlign = -cpp
-
-HC_OPTS_hpg    = _Hm(8)
-HC_OPTS_infer  = _Km(2)
-HC_OPTS_lift   = _Hm(8) _Km(1)
-HC_OPTS_mkhprog        = _Hm(12)
-HC_OPTS_parser = _Hm(30) _Km(1)
-HC_OPTS_prolog = _Hm(8)
-HC_OPTS_reptile        = _Hm(10) _Km(1)
-HC_OPTS_simple  = _Hm(12)
-
-HC_OPTS_veritas        = _Hm(14) _Km(1)
-HC_OPTS_veritas_Main   = -cpp
-HC_OPTS_veritas_Parse  = _Hm(18)
-
-NOFIB_RUN_symalg = +RTS -H64m -RTS
-HC_OPTS_awards = if19plus(-syslib hbc)
-HC_OPTS_boyer_Main = _Hm(16)
-HC_OPTS_cichelli = -cpp
-HC_OPTS_fibheaps = -fglasgow-exts -cpp
-NOFIB_RUN_fibheaps = +RTS -K2m -RTS
-HC_OPTS_knights_Sort = -cpp
-HC_OPTS_knights_ChessSetList = _Hm(14)
-HC_OPTS_multiplier_Main = _Hm(14)
-HC_OPTS_minimax = -cpp
-HC_OPTS_rewrite_Main = _Hm(14)
-/* HC_OPTS_fft_Word = -fglasgow-exts */
-
-HC_OPTS_comp_lab_zift  = -cpp if19plus(-syslib hbc)
-HC_OPTS_event          = -cpp if19plus(-syslib hbc)
-HC_OPTS_fft            = -cpp if19plus(-syslib hbc) if24plus(-monly-4-regs)
-HC_OPTS_genfft         = -cpp if19plus(-syslib hbc) if24plus(-monly-4-regs)
-HC_OPTS_ida            = -cpp if19plus(-syslib hbc)
-HC_OPTS_listcompr      = -cpp if19plus(-syslib hbc)
-HC_OPTS_listcopy       = -cpp if19plus(-syslib hbc)
-HC_OPTS_parstof                = -cpp if19plus(-syslib hbc) _Hm(30) _Km(1) if24plus(-monly-4-regs)
-HC_OPTS_sched          = -cpp if19plus(-syslib hbc)
-HC_OPTS_solid          = -cpp if19plus(-syslib hbc) _Hm(30) _Km(3)
-HC_OPTS_transform      = -cpp if19plus(-syslib hbc) _Hm(12)
-HC_OPTS_typecheck      = -cpp if19plus(-syslib hbc)
-HC_OPTS_wang           = -cpp if19plus(-syslib hbc)
-HC_OPTS_wave4main      = -cpp if19plus(-syslib hbc) _Hm(12) if24plus(-monly-4-regs)
-
-HC_OPTS_nucleic2       = -cpp /*-DUSE_UNBOXED_FLOATS -DUSE_GLASGOW_HACKS*/ /*nope:-DUSE_HARTEL_LAZINESS*/ -fglasgow-exts
-
-HC_OPTS_editor3 = if19plus(-syslib posix)
-
-HC_OPTS_haskelldraw = -fglasgow-exts -L/usr/openwin/lib -L/usr/X11/lib -lXol -lXt -lXpm -lX11
-
-HC_OPTS_happy = -cpp -fglasgow-exts
-
-HC_OPTS_lolita = -cpp if19plus(-syslib hbc) if19plus(-syslib ghc) -fglasgow-exts -iutils:StaticNet:controls:tomita
-HC_OPTS_lolita_FeatureType = -Onot _Km(4) /* sigh */
-HC_OPTS_lolita_Roles = _Km(4)
-HC_OPTS_lolita_IMain = _Km(4)
-HC_OPTS_lolita_Dial_EmCausePB = -fno-update-analysis /* sigh */
-HC_OPTS_lolita_Dial_EmShowPB = -fno-update-analysis /* sigh */
-HC_OPTS_lolita_Dial_EmReact = -fno-update-analysis /* sigh */
-HC_OPTS_lolita_ExtractRootItal = -fno-update-analysis /* sigh */
-
-HC_OPTS_nhccomp = -cpp if19plus(-syslib hbc)
-HC_OPTS_linsolv = -fglasgow-exts -cpp -UNO_FILTER -DASYM_CRA -DGUM -DPAR_DET_SZ=4 -DINPUT_SIZE=4
-HC_OPTS_dcbm    = -fglasgow-exts -cpp -DPAR 
-
-NOFIB_RUN_exp3_8 = +RTS -K1m -RTS
-NOFIB_RUN_fulsom  = +RTS -H12m -RTS
-
-NOFIB_RUN_gamteb  = +RTS -K1500k -RTS  /* SIGH */
-
-NOFIB_RUN_hidden  = +RTS -K1m -RTS     /* fairly random number; SIGH */
-
-/*??? NOFIB_RUN_HMMS     = +RTS -H54M -K1M -RTS*/
-NOFIB_RUN_reptile = +RTS -H6m -RTS
-
-NOFIB_RUN_life    = +RTS -H32m -RTS
-
-NOFIB_RUN_maillist = +RTS -K100k -RTS
-
-NOFIB_RUN_cichelli = +RTS -H6m -RTS
-
-NOFIB_RUN_comp_lab_zift        = +RTS -H20m -K10m -RTS
-NOFIB_RUN_event                = +RTS -H24m -K4500k -RTS
-NOFIB_RUN_fft          = +RTS -H24m -K1m -RTS
-NOFIB_RUN_genfft       = +RTS -H20m -K10m -RTS
-NOFIB_RUN_ida          = +RTS -H24m -K1m -RTS
-NOFIB_RUN_listcompr    = +RTS -H24m -K1m -RTS
-NOFIB_RUN_listcopy     = +RTS -H24m -K1m -RTS
-NOFIB_RUN_parstof      = +RTS -H24m -K1m -RTS
-NOFIB_RUN_sched                = +RTS -H24m -K1m -RTS
-NOFIB_RUN_solid                = +RTS -H24m -K1m -RTS
-NOFIB_RUN_transform    = +RTS -H24m -K1m -RTS
-NOFIB_RUN_typecheck    = +RTS -H24m -K6m -RTS
-NOFIB_RUN_wang         = +RTS -H24m -K6m -RTS
-NOFIB_RUN_wave4main    = +RTS -H24m -K1m -RTS
-
-NOFIB_RUN_clausify  = +RTS -K200k -RTS
-
-NOFIB_RUN_simple    = +RTS -H16m -K1m -RTS
-
-NOFIB_RUN_treejoin  = +RTS -H32m -K2m
-
-NOFIB_RUN_exp3_8    = +RTS -K300k -RTS
-NOFIB_RUN_primes    = +RTS -H16m -RTS
-
-/* **********  END OF all that follows ... ************* */
-#if IncludeGHC_ONLYNoFibTests == YES
-
-HC_OPTS_cg012 = -fglasgow-exts
-HC_OPTS_cg015 = -fglasgow-exts
-HC_OPTS_cg018 = -fglasgow-exts
-HC_OPTS_cg025 = if19plus(-syslib hbc)
-HC_OPTS_cg026 = -fglasgow-exts
-HC_OPTS_cg029 = -fglasgow-exts
-HC_OPTS_cg030 = -fglasgow-exts
-HC_OPTS_cg031 = -fglasgow-exts
-HC_OPTS_cg032 = -fglasgow-exts
-HC_OPTS_cg033 = -fglasgow-exts
-HC_OPTS_cg035 = -fglasgow-exts -fvia-C /*'-#include"math.h"'*/
-HC_OPTS_cg036 = -fglasgow-exts
-
-HC_OPTS_ghclib001 = if19plus(-syslib ghc)
-NOFIB_RUN_ghclib001 = +RTS -H16m -K8m -RTS
-
-NOFIB_RUN_cg021 = +RTS -H15000k -K4500k -RTS
-
-NOFIB_RUN_cg022 = +RTS -H10m -RTS
-
-HC_OPTS_cg023 = _Hm(14)
-NOFIB_RUN_cg023 = +RTS -H32k -RTS
-       /* the whole point of cg023 is that it runs in small space */
-
-HC_OPTS_arith005 = -cpp -fno-update-analysis/*sigh*/
-
-HC_OPTS_io009 = if19plus(-syslib hbc)
-HC_OPTS_io012 = if19plus(-syslib ghc)
-HC_OPTS_io018 = if19plus(-syslib ghc)
-HC_OPTS_io019 = if19plus(-syslib ghc -syslib posix)
-HC_OPTS_io020 = if19plus(-syslib ghc -syslib posix)
-
-HC_OPTS_po001 = if19plus(-syslib posix -syslib ghc)
-HC_OPTS_po002 = if19plus(-syslib posix)
-HC_OPTS_po003 = if19plus(-syslib posix)
-HC_OPTS_po004 = if19plus(-syslib posix) -fvia-C
-HC_OPTS_po005 = if19plus(-syslib posix)
-HC_OPTS_po006 = if19plus(-syslib posix)
-HC_OPTS_po007 = if19plus(-syslib posix) -fvia-C
-HC_OPTS_po008 = if19plus(-syslib posix) -fvia-C
-HC_OPTS_po009 = if19plus(-syslib posix) -fvia-C
-HC_OPTS_po010 = if19plus(-syslib posix)
-HC_OPTS_po011 = if19plus(-syslib posix)
-HC_OPTS_po012 = if19plus(-syslib posix) -fvia-C /*??? '-#include"libposix.h"' */
-
-HC_OPTS_net001 = if19plus(-syslib ghc)
-HC_OPTS_net002 = if19plus(-syslib ghc)
-HC_OPTS_net003 = if19plus(-syslib ghc)
-HC_OPTS_net004 = if19plus(-syslib ghc)
-HC_OPTS_net005 = if19plus(-syslib ghc)
-HC_OPTS_net006 = if19plus(-syslib ghc)
-HC_OPTS_net007 = if19plus(-syslib ghc) if19plus(-syslib posix)
-HC_OPTS_net008 = if19plus(-syslib ghc) if19plus(-syslib posix)
-
-HC_OPTS_stable001 = -fvia-C -fglasgow-exts
-NOFIB_RUN_stable001 = +RTS -H10k -RTS
-
-/* specialisation tests, esp for unboxed specialisation */
-HC_OPTS_spec001            = -fglasgow-exts
-HC_OPTS_spec003            = -fglasgow-exts
-HC_OPTS_clausify001 = -fglasgow-exts
-HC_OPTS_clausify002 = -fglasgow-exts
-HC_OPTS_clausify003 = -fglasgow-exts
-
-/* keep the heap down on 10queens in the hope it will not "loop" */
-NOFIB_RUN_10queens = +RTS -H1m -RTS
-
-HC_OPTS_fast2haskell = _Hm(20)
-HC_OPTS_fast2haskell_Word2 = -fglasgow-exts
-
-HC_OPTS_cvh_unboxing = -fglasgow-exts
-
-HC_OPTS_areid_pass = -fglasgow-exts
-
-NOFIB_RUN_jules_xref = +RTS -K1m -H20m -RTS
-
-NOFIB_RUN_life_space_leak = +RTS -H32m -RTS
-
-HC_OPTS_north_lias = _Hm(32)
-
-HC_OPTS_zhang_ccall = -fglasgow-exts
-
-HC_OPTS_dmgob_native1 = if19plus(-syslib hbc)
-HC_OPTS_dmgob_native1_MaybeStateT = -cpp
-
-HC_OPTS_dmgob_native2 = if19plus(-syslib hbc) -cpp
-
-HC_OPTS_andy_cherry = -cpp
-HC_OPTS_ipoole_spec_class = -cpp
-HC_OPTS_waugh_neural = if19plus(-syslib hbc)
-
-#endif /* IncludeGHC_ONLYNoFibTests */