Commit 6646a022 authored by andy@galois.com's avatar andy@galois.com
Browse files

removing -fhpc-tracer from ghc, is subsumed by the GHC debugger

parent a171dac2
......@@ -94,7 +94,6 @@ module CLabel (
mkHpcTicksLabel,
mkHpcModuleNameLabel,
mkHpcModuleOffsetLabel,
infoLblToEntryLbl, entryLblToInfoLbl,
needsCDecl, isAsmTemp, maybeAsmTemp, externallyVisibleCLabel,
......@@ -210,7 +209,6 @@ data CLabel
| HpcTicksLabel Module -- Per-module table of tick locations
| HpcModuleNameLabel -- Per-module name of the module for Hpc
| HpcModuleOffsetLabel Module-- Per-module offset of the module for Hpc (dynamically generated)
deriving (Eq, Ord)
......@@ -412,7 +410,6 @@ mkRtsSlowTickyCtrLabel pat = RtsLabel (RtsSlowTickyCtr pat)
mkHpcTicksLabel = HpcTicksLabel
mkHpcModuleNameLabel = HpcModuleNameLabel
mkHpcModuleOffsetLabel = HpcModuleOffsetLabel
-- Dynamic linking
......@@ -486,7 +483,6 @@ needsCDecl (ForeignLabel _ _ _) = False
needsCDecl (CC_Label _) = True
needsCDecl (CCS_Label _) = True
needsCDecl (HpcTicksLabel _) = True
needsCDecl (HpcModuleOffsetLabel _) = True
needsCDecl HpcModuleNameLabel = False
-- Whether the label is an assembler temporary:
......@@ -521,7 +517,6 @@ externallyVisibleCLabel (CC_Label _) = True
externallyVisibleCLabel (CCS_Label _) = True
externallyVisibleCLabel (DynamicLinkerLabel _ _) = False
externallyVisibleCLabel (HpcTicksLabel _) = True
externallyVisibleCLabel (HpcModuleOffsetLabel _) = True
externallyVisibleCLabel HpcModuleNameLabel = False
-- -----------------------------------------------------------------------------
......@@ -788,9 +783,6 @@ pprCLbl (PlainModuleInitLabel mod _)
pprCLbl (HpcTicksLabel mod)
= ptext SLIT("_hpc_tickboxes_") <> ppr mod <> ptext SLIT("_hpc")
pprCLbl (HpcModuleOffsetLabel mod)
= ptext SLIT("_hpc_module_offset_") <> ppr mod <> ptext SLIT("_hpc")
pprCLbl HpcModuleNameLabel
= ptext SLIT("_hpc_module_name_str")
......
......@@ -34,26 +34,6 @@ cgTickBox mod n = do
, CmmLit (CmmInt 1 I64)
])
]
let ext_tick_box = CmmLit $ CmmLabel $ mkHpcModuleOffsetLabel $ mod
whenC (opt_Hpc_Tracer) $ do
emitForeignCall'
PlayRisky -- ??
[]
(CmmForeignCall
(CmmLit $ CmmLabel $ mkForeignLabel visible_tick Nothing False)
CCallConv
)
[ (CmmMachOp (MO_Add I32)
[ CmmLoad ext_tick_box I32
, CmmLit (CmmInt (fromIntegral n) I32)
]
, NoHint)
, ( CmmReg (CmmGlobal CurrentTSO)
, PtrHint
)
]
(Just [])
where
visible_tick = mkFastString "hs_hpc_tick"
......@@ -65,10 +45,6 @@ hpcTable this_mod (HpcInfo hpc_tickCount _) = do
(module_name_str)
++ [0]
]
emitData Data -- change Offset => Data or Info
[ CmmDataLabel (mkHpcModuleOffsetLabel this_mod)
, CmmStaticLit (CmmInt 0 I32) -- stored offset?
]
emitData Data $ [ CmmDataLabel (mkHpcTicksLabel this_mod)
] ++
[ CmmStaticLit (CmmInt 0 I64)
......@@ -94,8 +70,6 @@ initHpc this_mod (HpcInfo tickCount hashNo)
, (CmmLit $ CmmLabel $ mkHpcTicksLabel $ this_mod,PtrHint)
]
(Just [])
; let ext_tick_box = CmmLit $ CmmLabel $ mkHpcModuleOffsetLabel $ this_mod
; stmtsC [ CmmStore ext_tick_box (CmmReg id) ]
}
where
mod_alloc = mkFastString "hs_hpc_module"
......
......@@ -30,7 +30,6 @@ module StaticFlags (
-- Hpc opts
opt_Hpc,
opt_Hpc_Tracer,
-- language opts
opt_DictsStrict,
......@@ -286,10 +285,7 @@ opt_SccProfilingOn = lookUp FSLIT("-fscc-profiling")
opt_DoTickyProfiling = WayTicky `elem` (unsafePerformIO $ readIORef v_Ways)
-- Hpc opts
opt_Hpc = lookUp FSLIT("-fhpc")
|| opt_Hpc_Tracer
opt_Hpc_Tracer = lookUp FSLIT("-fhpc-tracer")
-- language opts
opt_DictsStrict = lookUp FSLIT("-fdicts-strict")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment