From 0d792bea36420e657fb293d9f90f35d8ef96cb4f Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Thu, 10 Jul 2008 12:48:27 +0000 Subject: [PATCH] Move some flags from the Makefile into module pragmas --- compiler/Makefile | 8 -------- compiler/utils/Binary.hs | 4 ++++ compiler/utils/Encoding.hs | 4 ++++ compiler/utils/FastMutInt.lhs | 6 +++++- compiler/utils/FastString.lhs | 4 ++++ compiler/utils/StringBuffer.lhs | 4 ++++ 6 files changed, 21 insertions(+), 9 deletions(-) diff --git a/compiler/Makefile b/compiler/Makefile index ea3e07b..ea02562 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -645,14 +645,6 @@ endif # basicTypes/SrcLoc_HC_OPTS = -funbox-strict-fields -# We always optimise some low-level modules, otherwise performance of -# a non-optimised compiler is severely affected. -utils/Binary_HC_OPTS += -O -funbox-strict-fields -utils/FastMutInt_HC_OPTS += -O -utils/Encoding_HC_OPTS += -O -utils/StringBuffer_HC_OPTS += -O -funbox-strict-fields -utils/FastString_HC_OPTS += -O -funbox-strict-fields - # ---- Profiling ---- #simplCore/Simplify_HC_OPTS = -auto-all #simplCore/SimplEnv_HC_OPTS = -auto-all diff --git a/compiler/utils/Binary.hs b/compiler/utils/Binary.hs index 3d20609..80d10cb 100644 --- a/compiler/utils/Binary.hs +++ b/compiler/utils/Binary.hs @@ -1,4 +1,8 @@ {-# OPTIONS -cpp #-} +{-# OPTIONS_GHC -O -funbox-strict-fields #-} +-- We always optimise this, otherwise performance of a non-optimised +-- compiler is severely affected + -- -- (c) The University of Glasgow 2002-2006 -- diff --git a/compiler/utils/Encoding.hs b/compiler/utils/Encoding.hs index f2659e6..c790f38 100644 --- a/compiler/utils/Encoding.hs +++ b/compiler/utils/Encoding.hs @@ -1,3 +1,7 @@ +{-# OPTIONS_GHC -O #-} +-- We always optimise this, otherwise performance of a non-optimised +-- compiler is severely affected + -- ----------------------------------------------------------------------------- -- -- (c) The University of Glasgow, 1997-2006 diff --git a/compiler/utils/FastMutInt.lhs b/compiler/utils/FastMutInt.lhs index 00aba34..e8ea58c 100644 --- a/compiler/utils/FastMutInt.lhs +++ b/compiler/utils/FastMutInt.lhs @@ -1,10 +1,14 @@ +\begin{code} {-# OPTIONS -cpp #-} +{-# OPTIONS_GHC -O #-} +-- We always optimise this, otherwise performance of a non-optimised +-- compiler is severely affected + -- -- (c) The University of Glasgow 2002-2006 -- -- Unboxed mutable Ints -\begin{code} module FastMutInt( FastMutInt, newFastMutInt, readFastMutInt, writeFastMutInt, diff --git a/compiler/utils/FastString.lhs b/compiler/utils/FastString.lhs index ac79b5b..f338002 100644 --- a/compiler/utils/FastString.lhs +++ b/compiler/utils/FastString.lhs @@ -2,6 +2,10 @@ % (c) The University of Glasgow, 1997-2006 % \begin{code} +{-# OPTIONS_GHC -O -funbox-strict-fields #-} +-- We always optimise this, otherwise performance of a non-optimised +-- compiler is severely affected + {- FastString: A compact, hash-consed, representation of character strings. Comparison is O(1), and you can get a Unique from them. diff --git a/compiler/utils/StringBuffer.lhs b/compiler/utils/StringBuffer.lhs index d51c800..3b2a3df 100644 --- a/compiler/utils/StringBuffer.lhs +++ b/compiler/utils/StringBuffer.lhs @@ -6,6 +6,10 @@ Buffers for scanning string input stored in external arrays. \begin{code} +{-# OPTIONS_GHC -O -funbox-strict-fields #-} +-- We always optimise this, otherwise performance of a non-optimised +-- compiler is severely affected + module StringBuffer ( StringBuffer(..), -- 1.7.10.4