Bug 873640 - Fix and cleanup profiledbuild profile script invocation.…

… r=ted
syg · May 21, 2013 · 461bfb0 · 461bfb0
1 parent 2c40268
commit 461bfb0
Show file tree

Hide file tree

Showing 16 changed files with 1 addition and 229 deletions.
diff --git a/b2g/config/mozconfigs/linux32_gecko/nightly b/b2g/config/mozconfigs/linux32_gecko/nightly
@@ -16,9 +16,6 @@ ac_add_options --enable-stdcxx-compat
 # by 2 MBs.
 STRIP_FLAGS="--strip-debug"
 
-# PGO
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
-
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 

diff --git a/b2g/config/mozconfigs/linux64_gecko/nightly b/b2g/config/mozconfigs/linux64_gecko/nightly
@@ -16,9 +16,6 @@ ac_add_options --enable-stdcxx-compat
 # by 2 MBs.
 STRIP_FLAGS="--strip-debug"
 
-# PGO
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'
-
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 

diff --git a/b2g/config/mozconfigs/win32_gecko/nightly b/b2g/config/mozconfigs/win32_gecko/nightly
@@ -1,8 +1,5 @@
 . "$topsrcdir/b2g/config/mozconfigs/common"
 
-# for pgo
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
-
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-jemalloc

diff --git a/browser/config/mozconfigs/linux32/beta b/browser/config/mozconfigs/linux32/beta
@@ -7,9 +7,7 @@ ac_add_options --enable-official-branding
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 
-# PGO
 mk_add_options MOZ_PGO=1
-mk_add_options PROFILE_GEN_SCRIPT='EXTRA_TEST_ARGS=10 $(MAKE) -C $(MOZ_OBJDIR) pgo-profile-run'
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1

diff --git a/browser/config/mozconfigs/linux32/nightly b/browser/config/mozconfigs/linux32/nightly
@@ -17,9 +17,6 @@ ac_add_options --enable-stdcxx-compat
 # by 2 MBs.
 STRIP_FLAGS="--strip-debug"
 
-# PGO
-mk_add_options PROFILE_GEN_SCRIPT='EXTRA_TEST_ARGS=10 $(MAKE) -C $(MOZ_OBJDIR) pgo-profile-run'
-
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 

diff --git a/browser/config/mozconfigs/linux32/qt b/browser/config/mozconfigs/linux32/qt
@@ -9,9 +9,6 @@ ac_add_options --enable-stdcxx-compat
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
-# PGO
-mk_add_options PROFILE_GEN_SCRIPT='EXTRA_TEST_ARGS=10 $(MAKE) -C $(MOZ_OBJDIR) pgo-profile-run'
-
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
 

diff --git a/browser/config/mozconfigs/linux32/rpm b/browser/config/mozconfigs/linux32/rpm
@@ -19,8 +19,6 @@ export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
 
-mk_add_options PROFILE_GEN_SCRIPT='$(MAKE) -C $(MOZ_OBJDIR) pgo-profile-run'
-
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
 

diff --git a/browser/config/mozconfigs/linux64/beta b/browser/config/mozconfigs/linux64/beta
@@ -7,9 +7,7 @@ ac_add_options --enable-official-branding
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 
-# PGO
 mk_add_options MOZ_PGO=1
-mk_add_options PROFILE_GEN_SCRIPT='EXTRA_TEST_ARGS=10 $(MAKE) -C $(MOZ_OBJDIR) pgo-profile-run'
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1

diff --git a/browser/config/mozconfigs/linux64/nightly b/browser/config/mozconfigs/linux64/nightly
@@ -17,9 +17,6 @@ ac_add_options --enable-stdcxx-compat
 # by 2 MBs.
 STRIP_FLAGS="--strip-debug"
 
-# PGO
-mk_add_options PROFILE_GEN_SCRIPT='EXTRA_TEST_ARGS=10 $(MAKE) -C $(MOZ_OBJDIR) pgo-profile-run'
-
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 

diff --git a/browser/config/mozconfigs/linux64/rpm b/browser/config/mozconfigs/linux64/rpm
@@ -19,8 +19,6 @@ export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
 
-mk_add_options PROFILE_GEN_SCRIPT='$(MAKE) -C $(MOZ_OBJDIR) pgo-profile-run'
-
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
 

diff --git a/browser/config/mozconfigs/win32/beta b/browser/config/mozconfigs/win32/beta
@@ -1,8 +1,6 @@
 . "$topsrcdir/browser/config/mozconfigs/common"
 
-# for pgo
 mk_add_options MOZ_PGO=1
-mk_add_options PROFILE_GEN_SCRIPT='$(MAKE) -C $(MOZ_OBJDIR) pgo-profile-run'
 
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging

diff --git a/browser/config/mozconfigs/win32/nightly b/browser/config/mozconfigs/win32/nightly
@@ -1,8 +1,5 @@
 . "$topsrcdir/browser/config/mozconfigs/common"
 
-# for pgo
-mk_add_options PROFILE_GEN_SCRIPT='$(MAKE) -C $(MOZ_OBJDIR) pgo-profile-run'
-
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-jemalloc

diff --git a/browser/config/mozconfigs/win64/nightly b/browser/config/mozconfigs/win64/nightly
@@ -3,9 +3,6 @@
 ac_add_options --target=x86_64-pc-mingw32
 ac_add_options --host=x86_64-pc-mingw32
 
-# for pgo
-mk_add_options PROFILE_GEN_SCRIPT='$(MAKE) -C $(MOZ_OBJDIR) pgo-profile-run'
-
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-jemalloc

diff --git a/build/profile_pageloader.html b/build/profile_pageloader.html
diff --git a/build/profile_pageloader.pl b/build/profile_pageloader.pl
diff --git a/client.mk b/client.mk
@@ -197,12 +197,6 @@ everything: clean build
 
 ####################################
 # Profile-Guided Optimization
-#  To use this, you should set the following variables in your mozconfig
-#    mk_add_options PROFILE_GEN_SCRIPT=/path/to/profile-script
-#
-#  The profile script should exercise the functionality to be included
-#  in the profile feedback.
-#
 #  This is up here, outside of the MOZ_CURRENT_PROJECT logic so that this
 #  is usable in multi-pass builds, where you might not have a runnable
 #  application until all the build passes and postflight scripts have run.
@@ -216,7 +210,7 @@ profiledbuild::
 	$(MAKE) -f $(TOPSRCDIR)/client.mk realbuild MOZ_PROFILE_GENERATE=1 MOZ_PGO_INSTRUMENTED=1
 	$(MAKE) -C $(PGO_OBJDIR) package MOZ_PGO_INSTRUMENTED=1 MOZ_INTERNAL_SIGNING_FORMAT= MOZ_EXTERNAL_SIGNING_FORMAT=
 	rm -f ${PGO_OBJDIR}/jarlog/en-US.log
-	MOZ_PGO_INSTRUMENTED=1 OBJDIR=${PGO_OBJDIR} JARLOG_FILE=${PGO_OBJDIR}/jarlog/en-US.log $(PROFILE_GEN_SCRIPT)
+	MOZ_PGO_INSTRUMENTED=1 JARLOG_FILE=jarlog/en-US.log EXTRA_TEST_ARGS=10 $(MAKE) -C $(PGO_OBJDIR) pgo-profile-run
 	$(MAKE) -f $(TOPSRCDIR)/client.mk maybe_clobber_profiledbuild
 	$(MAKE) -f $(TOPSRCDIR)/client.mk realbuild MOZ_PROFILE_USE=1