public
/
toolchain
5
0
Fork 0
Code Issues 5 Pull Requests 1 Packages Projects Releases Wiki Activity

improved profiling, and profile self

This commit is contained in:
Lance Vick 2023-10-09 17:03:44 -07:00
parent f0d39c33bc
commit c61a119e3c
Signed by: lrvick
GPG Key ID: 8E47A1EC35A1551D
1 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Makefile
View File

@ -56,25 +56,45 @@ ifneq ($(TOOLCHAIN_PROFILE),false)
mkc := $(shell mkdir -p $(CACHE_DIR_ROOT)) mkc := $(shell mkdir -p $(CACHE_DIR_ROOT))
ifndef TOOLCHAIN_PROFILE_RUNNING ifndef TOOLCHAIN_PROFILE_RUNNING
rmp := $(shell rm -f $(CACHE_DIR_ROOT)/toolchain-profile.csv) rmp := $(shell rm -f $(CACHE_DIR_ROOT)/toolchain-profile.csv)
TOOLCHAIN_PROFILE_INIT := $(shell date +%s)
TOOLCHAIN_PROFILE_START := 0 TOOLCHAIN_PROFILE_START := 0
TOOLCHAIN_PROFILE_TOTAL := 0
TOOLCHAIN_PROFILE_TRACKED := 0
TOOLCHAIN_PROFILE_UNTRACKED := 0
TOOLCHAIN_PROFILE_RUNNING := true TOOLCHAIN_PROFILE_RUNNING := true
export TOOLCHAIN_PROFILE_RUNNING TOOLCHAIN_PROFILE_START export TOOLCHAIN_PROFILE_RUNNING TOOLCHAIN_PROFILE_START TOOLCHAIN_PROFILE_TOTAL TOOLCHAIN_PROFILE_UNTRACKED TOOLCHAIN_PROFILE_TRACKED
endif endif
.PHONY: toolchain-profile .PHONY: toolchain-profile
toolchain-profile: toolchain-profile:
@echo Target build times: $(call toolchain-profile-total)
@column -s, -t < $(CACHE_DIR_ROOT)/toolchain-profile.csv $(call toolchain-profile-tracked)
$(call toolchain-profile-untracked)
@printf "unprofiled,%s\n" "$(TOOLCHAIN_PROFILE_UNTRACKED)" >> $(CACHE_DIR_ROOT)/toolchain-profile.csv
@printf "total,%s" "$(TOOLCHAIN_PROFILE_TOTAL)" >> $(CACHE_DIR_ROOT)/toolchain-profile.csv
@echo Build times:
@column -c 80 -s, -t < $(CACHE_DIR_ROOT)/toolchain-profile.csv
endif endif
define toolchain_profile_start define toolchain-profile-total
$(eval TOOLCHAIN_PROFILE_TOTAL=$(shell date -d@$$(($(shell date +%s)-$(TOOLCHAIN_PROFILE_INIT))) -u +%s))
endef
define toolchain-profile-tracked
$(eval TOOLCHAIN_PROFILE_TRACKED=$(shell cat $(CACHE_DIR_ROOT)/toolchain-profile.csv | cut -d ',' -f2 | awk '{ sum += $$1 } END { print sum }'))
endef
define toolchain-profile-untracked
$(eval TOOLCHAIN_PROFILE_UNTRACKED=$(shell printf $$(($(TOOLCHAIN_PROFILE_TOTAL)-$(TOOLCHAIN_PROFILE_TRACKED))) -u +%s))
endef
define toolchain-profile-start
$(eval TOOLCHAIN_PROFILE_START=$(shell date +%s)) $(eval TOOLCHAIN_PROFILE_START=$(shell date +%s))
echo START=$(TOOLCHAIN_PROFILE_START)
@printf "%s," "$@" >> $(CACHE_DIR_ROOT)/toolchain-profile.csv @printf "%s," "$@" >> $(CACHE_DIR_ROOT)/toolchain-profile.csv
endef endef
define toolchain_profile_end define toolchain-profile-end
printf "%s\n" "$$(date -d@$$(($$(date +%s)-$(TOOLCHAIN_PROFILE_START))) -u +%H:%M:%S)" >> $(CACHE_DIR_ROOT)/toolchain-profile.csv printf "%s\n" "$$(($$(date +%s)-$(TOOLCHAIN_PROFILE_START)))" >> $(CACHE_DIR_ROOT)/toolchain-profile.csv
endef endef
export export
@ -133,6 +153,7 @@ $(CONFIG_DIR)/apt-pins-x86_64.list \
$(CONFIG_DIR)/apt-sources-x86_64.list \ $(CONFIG_DIR)/apt-sources-x86_64.list \
$(CONFIG_DIR)/apt-hashes-x86_64.list: \ $(CONFIG_DIR)/apt-hashes-x86_64.list: \
$(CONFIG_DIR)/apt-base.list $(CONFIG_DIR)/apt-base.list
$(call toolchain-profile-start)
mkdir -p $(FETCH_DIR)/apt \ mkdir -p $(FETCH_DIR)/apt \
&& docker run \ && docker run \
--rm \ --rm \
@ -146,9 +167,11 @@ $(CONFIG_DIR)/apt-base.list
--workdir $(TOOLCHAIN_WORKDIR) \ --workdir $(TOOLCHAIN_WORKDIR) \
debian@sha256:$(DEBIAN_HASH) \ debian@sha256:$(DEBIAN_HASH) \
/usr/local/bin/packages-update /usr/local/bin/packages-update
$(call toolchain-profile-end)
# Pin all packages in toolchain container to latest versions # Pin all packages in toolchain container to latest versions
$(FETCH_DIR)/apt/Packages.bz2: $(CONFIG_DIR)/apt-hashes-x86_64.list $(FETCH_DIR)/apt/Packages.bz2: $(CONFIG_DIR)/apt-hashes-x86_64.list
$(call toolchain-profile-start)
docker run \ docker run \
--rm \ --rm \
--tty \ --tty \
@ -164,6 +187,7 @@ $(FETCH_DIR)/apt/Packages.bz2: $(CONFIG_DIR)/apt-hashes-x86_64.list
--workdir $(TOOLCHAIN_WORKDIR) \ --workdir $(TOOLCHAIN_WORKDIR) \
debian@sha256:$(DEBIAN_HASH) \ debian@sha256:$(DEBIAN_HASH) \
/usr/local/bin/packages-fetch /usr/local/bin/packages-fetch
$(call toolchain-profile-end)
.PHONY: toolchain-clean .PHONY: toolchain-clean
toolchain-clean: toolchain-clean:
@ -251,6 +275,7 @@ $(CACHE_DIR_ROOT)/toolchain.tgz: \
$(CONFIG_DIR)/apt-pins-$(ARCH).list \ $(CONFIG_DIR)/apt-pins-$(ARCH).list \
$(CONFIG_DIR)/apt-hashes-$(ARCH).list \ $(CONFIG_DIR)/apt-hashes-$(ARCH).list \
| $(FETCH_DIR)/apt/Packages.bz2 | $(FETCH_DIR)/apt/Packages.bz2
$(call toolchain-profile-start)
mkdir -p $(CACHE_DIR) mkdir -p $(CACHE_DIR)
DOCKER_BUILDKIT=1 \ DOCKER_BUILDKIT=1 \
docker build \ docker build \
@ -263,6 +288,7 @@ $(CACHE_DIR_ROOT)/toolchain.tgz: \
-f $(SRC_DIR)/toolchain/Dockerfile \ -f $(SRC_DIR)/toolchain/Dockerfile \
. .
docker save "$(IMAGE)" | gzip > "$@" docker save "$(IMAGE)" | gzip > "$@"
$(call toolchain-profile-end)
$(CACHE_DIR_ROOT)/toolchain.state: \ $(CACHE_DIR_ROOT)/toolchain.state: \
$(CACHE_DIR_ROOT)/toolchain.tgz $(CACHE_DIR_ROOT)/toolchain.tgz
@ -372,4 +398,3 @@ define toolchain
$$(cat $(CACHE_DIR_ROOT)/toolchain.state 2> /dev/null) \ $$(cat $(CACHE_DIR_ROOT)/toolchain.state 2> /dev/null) \
$(SRC_DIR)/toolchain/scripts/host-env bash -c $(1) $(SRC_DIR)/toolchain/scripts/host-env bash -c $(1)
endef endef