Changeset 4273


Ignore:
Timestamp:
Jan 7, 2010 4:24:46 PM (8 years ago)
Author:
classenm
Message:

added additional heuristic that only adds ispc constraints, if tiling is not fully dimensional for a target statement, i.e. if coordsDim > tiledDim

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/hsloopo/StagedCodeGenInput.hs

    r4272 r4273  
    130130createAddTaskInput :: CompSpreadDS -> String
    131131createAddTaskInput csDS =
    132     -- verbose "createAddTaskInput" $
     132    verbose "createAddTaskInput" $
    133133    cloogInput
    134134    where
     
    196196addTaskIneqs :: CompSpreadDS -> [IneqSystem]
    197197addTaskIneqs csDS =
    198     -- verbose "addTaskIneqs" $
     198    verbose "addTaskIneqs" $
    199199    ineqs
    200200    where
     
    232232createCompTaskInput :: CompSpreadDS -> String
    233233createCompTaskInput csDS =
    234     -- verbose "createCompTaskInput" $
     234    verbose "createCompTaskInput" $
    235235    computeStmtInput
    236236    where
     
    371371computeStmtsTileDims csDS =
    372372    -- trace (showIS2VisualPolylib firstCompIS (nVars firstCompIS)) $
    373     -- verbose "computeStmtsTileDims" $
     373    verbose "computeStmtsTileDims" $
    374374    -- trace ("compStmtTileISs: " ++ show compStmtTileISs) $
    375375    compStmtTileISs
     
    386386--         trace (show (selfDepRelation (stmtID, is))) $
    387387--         trace ("tiled dims: " ++ show tiledDims) $
    388 --         verbose ("tileTrStmt" ++ show stmtID) $
     388        verbose ("tileTrStmt" ++ show stmtID) $
    389389--         trace ("is: " ++ show is) $
    390390--         trace ("lattice: " ++ show lattice) $
     
    401401--    trace (show compIS) $
    402402    -- trace (show tiledDims) $
    403     -- verbose "computeStmtsInnerDims" $
     403    verbose "computeStmtsInnerDims" $
    404404    compISs
    405405    where
     
    419419    tileTrStmt :: TStatement -> (TStatementID, StatementID, IneqSystem)
    420420    tileTrStmt (trStmtID, stmtID, is) =   
    421         -- verbose ("tileTrStmt" ++ show trStmtID) $
     421        verbose ("tileTrStmt" ++ show trStmtID) $
    422422--         trace ("tileTrStmt #" ++ show trStmtID ++
    423423--                ", (isDim, coordsDim, tileDim, paramsDim, nColumns comp_M) = " ++
     
    485485                -> [(TrDependence,IneqSystem)]
    486486dependenceIneqs csDS hocType =
    487     -- verbose "dependenceIneqs" $
     487    verbose "dependenceIneqs" $
    488488    map tileTrDep filteredTrDeps
    489489    where
     
    506506    tileTrDep :: TrDependence -> (TrDependence,IneqSystem)
    507507    tileTrDep trDep =
    508         -- verbose ("tileTrDep" ++ show trDep) $
     508        verbose ("tileTrDep " ++ show trDep) $
    509509        (trDep,
    510510         ineqSystem ((tileDim + tileDim, paramsDim),
     
    631631    tileTrDep :: TrDependence -> (TrDependenceID, IneqSystem)
    632632    tileTrDep trDep =
    633         -- verbose ("tileTrDep" ++ show (trDepID trDep)) $
     633        verbose ("tileTrDep" ++ show (trDepID trDep)) $
    634634        -- ISPC | TISPC | TILE | TILE | PARAMS | CONST
    635635        (trDepID trDep,
     
    717717weighZDomain :: ZDomain -> Integer
    718718weighZDomain zd =
    719     -- verbose "weighZDomain" $
     719    verbose "weighZDomain" $
    720720    (numZPs * maxNumIneqs^2)
    721721    where
     
    10881088    lattice = csLatVects csDS
    10891089    tiledDims = csTiledDims csDS
     1090    nTiledDims = genericLength tiledDims
    10901091    infos = [SrcCoord,SrcTile]
    10911092    tispcs = csTISPCs csDS
     
    11161117            -- verbose "comp_M" $                 
    11171118            myMultijoin1 $
    1118             [ spaceTimeTrafo_M
    1119             , ispc_M
    1120             , coordsTile_M
    1121             , trc_M
    1122             ]
     1119            ([ spaceTimeTrafo_M
     1120             , coordsTile_M] ++
     1121             if coordsDim - nTiledDims > 0 then [ispc_M, trc_M] else []
     1122            )
    11231123       
    11241124        isDim = getISPCdim csDS trStmtID
Note: See TracChangeset for help on using the changeset viewer.