suzanne.soy/tock-mirror
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stopped Tock checking arrays that are declared inside the PAR being examined

Browse Source 
Fixes #84
This commit is contained in:
Neil Brown 2009-02-08 23:08:58 +00:00
parent d21e7c7437
commit e165030751
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
checks/ArrayUsageCheck.hs
View File

@ -99,6 +99,13 @@ checkArrayUsage :: forall m. (Die m, CSMR m, MonadIO m) => (Meta, ParItems (BK,
checkArrayUsage (m,p) = mapM_ (checkIndexes m) $ Map.toList $ checkArrayUsage (m,p) = mapM_ (checkIndexes m) $ Map.toList $
groupArrayIndexes $ fmap (transformPair id nodeVars) p groupArrayIndexes $ fmap (transformPair id nodeVars) p
where where
getDecl :: UsageLabel -> Maybe String
getDecl = join . fmap getScopeIn . nodeDecl
where
getScopeIn (ScopeIn _ n) = Just n
getScopeIn _ = Nothing
-- Takes a ParItems Vars, and returns a map from array-variable-name to a list of writes and a list of reads for that array. -- Takes a ParItems Vars, and returns a map from array-variable-name to a list of writes and a list of reads for that array.
-- Returns (array name, list of written-to indexes, list of read-from indexes) -- Returns (array name, list of written-to indexes, list of read-from indexes)
groupArrayIndexes :: ParItems (BK, Vars) -> Map.Map String (ParItems (BK, [A.Expression], [A.Expression])) groupArrayIndexes :: ParItems (BK, Vars) -> Map.Map String (ParItems (BK, [A.Expression], [A.Expression]))
@ -135,7 +142,8 @@ checkArrayUsage (m,p) = mapM_ (checkIndexes m) $ Map.toList $
checkIndexes :: Meta -> (String, ParItems (BK, [A.Expression], [A.Expression])) -> m () checkIndexes :: Meta -> (String, ParItems (BK, [A.Expression], [A.Expression])) -> m ()
checkIndexes m (arrName, indexes) = do checkIndexes m (arrName, indexes) = do
sharedNames <- getCompState >>* csNameAttr sharedNames <- getCompState >>* csNameAttr
when (Map.lookup arrName sharedNames /= Just NameShared) $ let declNames = [x | Just x <- fmap (getDecl . snd) $ flattenParItems p]
when (Map.lookup arrName sharedNames /= Just NameShared && arrName `notElem` declNames) $
do userArrName <- getRealName (A.Name undefined arrName) do userArrName <- getRealName (A.Name undefined arrName)
arrType <- astTypeOf (A.Name undefined arrName) arrType <- astTypeOf (A.Name undefined arrName)
arrLength <- case arrType of arrLength <- case arrType of

8
testcases/automatic/usage-check-2.occ.test
View File

@ -48,4 +48,12 @@ PROC m()
PAR j = 0 FOR 2 PAR j = 0 FOR 2
b[(j * 8) + i] := 3 b[(j * 8) + i] := 3
%PASS Safe use of variable declared inside PAR
[10]INT c:
c[0] := 1
%PASS Safe parallel use of variable declared inside PAR
[10]INT c:
PAR
c[0] := 1
c[1] := 2
% %