PR#117: Adjust dwz limits - rpms/llvm

rpms / llvm

#117 Adjust dwz limits

Closed 2 years ago by tstellar. Opened 2 years ago by tstellar.

rpms/ tstellar/llvm dwz-limits into rawhide

Adjust dwz limits

Tom Stellard • 2 years ago

acf6db1

llvm.spec

file modified

+24 -4

		`@@ -50,9 +50,26 @@`

		`%global build_install_prefix %{buildroot}%{install_prefix}`

		`- # Lower memory usage of dwz on s390x`
		`- %global _dwz_low_mem_die_limit_s390x 1`
		`- %global _dwz_max_die_limit_s390x 1000000`
		`+ # The arch specific limits supersede the general limits, so if there is an`
		`+ # arch specific limit defined in a global macro file, then the only way to`
		`+ # change the value is to use the arch specific variable. To be safe, we`
		`+ # just set the arch specific value for everything.`
		`+`
		`+ %global _dwz_max_die_limit 1100000000`
sergesanspaille commented 2 years ago What about something alongside `%{lua:for _, arch in ipairs({"x86_64", "arm64", ...}) do rpm.define(arch .. " %{_dwz_max_die_limit}") end}`
		`+ %global _dwz_max_die_limit_aarch64 %{_dwz_max_die_limit}`
		`+ %global _dwz_max_die_limit_armv7hl %{_dwz_max_die_limit}`
		`+ %global _dwz_max_die_limit_i686 %{_dwz_max_die_limit}`
		`+ %global _dwz_max_die_limit_ppc64le %{_dwz_max_die_limit}`
		`+ %global _dwz_max_die_limit_x86_64 %{_dwz_max_die_limit}`
		`+ %global _dwz_max_die_limit_s390x %{_dwz_max_die_limit}`
		`+`
		`+ %global _dwz_low_mem_die_limit 1100000000`
		`+ %global _dwz_low_mem_die_limit_aarch64 %{_dwz_low_mem_die_limit}`
		`+ %global _dwz_low_mem_die_limit_armv7hl %{_dwz_low_mem_die_limit}`
		`+ %global _dwz_low_mem_die_limit_i686 %{_dwz_low_mem_die_limit}`
		`+ %global _dwz_low_mem_die_limit_ppc64le %{_dwz_low_mem_die_limit}`
		`+ %global _dwz_low_mem_die_limit_x86_64 %{_dwz_low_mem_die_limit}`
		`+ %global _dwz_low_mem_die_limit_s390x %{_dwz_low_mem_die_limit}`

		`%ifarch %{arm}`
		`# koji overrides the _gnu variable to be gnu, which is not correct for clang, so`
		`@@ -64,7 +81,7 @@`

		`Name: %{pkg_name}`
		`Version: %{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~rc%{rc_ver}}`
		`- Release: 4%{?dist}`
		`+ Release: 5%{?dist}`
		`Summary: The Low Level Virtual Machine`

		`License: NCSA`
		`@@ -545,6 +562,9 @@`
		`%endif`

		`%changelog`
		`+ * Sat Oct 16 2021 Tom Stellard <tstellar@redhat.com> - 13.0.0-5`
		`+ - Adjust dwz limits`
		`+`
		`* Fri Oct 08 2021 Tom Stellard <tstellar@redhat.com> - 13.0.0-4`
		`- Fix default triple on arm`

tstellar commented 2 years ago

The higher limits make it possible to optimize the debuginfo of
libLLVM.so. On x86_64, this change reduces the final optimized debuginfo
size from 3.35GB to 2.92GB.

zuul commented 2 years ago

Build succeeded.

check-for-arches : SUCCESS in 1m 17s
rpm-scratch-build : SUCCESS in 1h 45m 43s
rpm-scratch-build-s390x : SUCCESS in 2h 23m 57s (non-voting)
rpm-scratch-build-ppc64le : SUCCESS in 1h 43m 33s (non-voting)
rpm-scratch-build-i686 : SUCCESS in 56m 59s (non-voting)
rpm-scratch-build-armv7hl : SUCCESS in 2h 04m 13s (non-voting)
rpm-scratch-build-aarch64 : SUCCESS in 3h 40m 13s (non-voting)
rpm-linter : SUCCESS in 5m 01s
rpm-rpminspect : POST_FAILURE in 10m 12s (non-voting)
check-for-tests : SUCCESS in 42s
check-for-fmf-tests : SUCCESS in 44s
rpm-install-test : SUCCESS in 5m 09s
rpm-test : SKIPPED
rpm-tmt-test : SUCCESS in 11m 17s

sergesanspaille commented on line 13 of llvm.spec 2 years ago

What about something alongside

%{lua:for _, arch in ipairs({"x86_64", "arm64", ...}) do rpm.define(arch .. " %{_dwz_max_die_limit}") end}

mvadkert commented 2 years ago

recheck

zuul commented 2 years ago

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.

Pull-Request has been closed by tstellar

2 years ago