From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id F09624C313 for ; Fri, 23 May 2025 22:05:39 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id C977968DFC0; Sat, 24 May 2025 01:05:36 +0300 (EEST) Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 2687768DFB6 for ; Sat, 24 May 2025 01:05:30 +0300 (EEST) Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-3109f106867so456958a91.1 for ; Fri, 23 May 2025 15:05:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1748037928; x=1748642728; darn=ffmpeg.org; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date :references:in-reply-to:message-id:from:from:to:cc:subject:date :message-id:reply-to; bh=W2+Q7olsC39VZ15b9haRIGt0XIpKwFwrUBCQklWOrSU=; b=i6mVIwdHd1SmWsWOW3rYEwHo5sJVKKppIeqDUpSjQFM3NFmvZM71TMKngr93UGb3mv gMJGEYuQ8OwJm6QkY6jiHPsS5ak4PscZdq1WEkWnf2GYV99b9Jj+Tk+VlowTrwd1/uNy f9DSCiuf/XhaoDizsUzYMp0mzs89d4g56fWPpG7lQyzhtDirdcWm8dZRPQuSNy48X72r iostKkipiJGiasRCdml7DShRiIyi1XQIBqMueYgwiXgfTQ+GvVBm7WdcVGVU2J3OkaBx XODXYhf8WCQuugD3OJDmvSNIH1Ceuamy6zKIK974PGumc1rW7d22E7xhn9a0VcxPJx1+ GoYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748037928; x=1748642728; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date :references:in-reply-to:message-id:from:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=W2+Q7olsC39VZ15b9haRIGt0XIpKwFwrUBCQklWOrSU=; b=Gvj7R4pq6jsKYs2sorzPJXPDxS97GQelbtTDfw9JeSZk3wglJ77PVYo0/lXX0SeBB4 JQjwdYpJhRKxBYhtnMd/kckEH923wXIElWZQIxJ8x5dR6INk4tZsQ0LM9jN/yKKOPdst 662TW4h+Wte69gwi0XmDUQL0ThLM59MQPNmu4ttbf987wR07uFQxSybpTqNhiL5kcjZl CqMltLKtxl/+FlckHBBT8PWkSXvUUu70sxYLumpY78uXvXB+q+bu+0UE+WdtKS2EssfJ kAYSIBME5Y8szFM6Qgy0Ita0RnjtaDlWOxxE41NV64iQUnoJQAdyh7k8YsVnW4pj6HGJ SRUw== X-Gm-Message-State: AOJu0Yz2VLTS8t8jDJnMDQ8JOzBIyLl6Ye7IaOrqcngC7ZI5n/cdEVhG 54zwSc7ZIRhC3B4VeDQSkcmCEkjuap2tl9OvMO+8gSfjOZKkFjrMtkaPyiprqA== X-Gm-Gg: ASbGnct1yPxjay058MZftxT9DlZSarW7ST8BOO9Iwzfqrbv0TnbZORO71XZhpOvnM7+ PfvOic7f0QZJu79l9BiXqqojjN1uVHH4GCvgdmhHcVXwKMw4t/9IEFDpn3Ef6cLH2dEaww7WySd 7SBEuzJOF7QyqQvtltmGXSjzdCkVDZ2D6CQ0GZDrBdK645cNSWa2eu9IfSiJQlBYQDAXU7osA7e 1+pPzLkrHCm6uStLi5J47kD/ZUGhDILWiB7gjF3/I/e1fg6nMWE8G0jIudmWxCMzExQBA+cQFVd pxdhza+rUyBmngCs1d4nkXVSlysiZgRc+AkCbpgDF3VgZ00UsjfKG15EYuXAj0/oyuVQlA== X-Google-Smtp-Source: AGHT+IFAPNmo23B6V2TLht0l61lq8Jfa8nwV4pmfBTbeAKamFY9AWF0fXNHCyV2DGZ/X59t64e/pxw== X-Received: by 2002:a17:90b:4e90:b0:2ee:5958:828 with SMTP id 98e67ed59e1d1-3110f0ec405mr1270821a91.9.1748037928273; Fri, 23 May 2025 15:05:28 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-30f364907d4sm7839848a91.24.2025.05.23.15.05.27 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 May 2025 15:05:27 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: In-Reply-To: References: Date: Fri, 23 May 2025 22:05:22 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v4] ffbuild/commonmak: Fix rebuild check with implicit rule chains X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: softworkz Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: softworkz When there's a chain of implicit rules, make treats files generated inside that chain as intermediate files. Those intermediate files are removed after completion of make. When make is run again, it normally determines the need for a rebuild by comparing the timestamps of the original source file and the final output of the chain and if still up-to-date, it doesn't rebuild, even when the intermediate files are not present. That makes sense of course - why would it delete them otherwise, it would end up in builds being never up-to-date. But this original by-the-book logic appeared to be broken and has been worked around by adding all intermediate files to the .SECONDARY special target, which required extra logic and issues with make clean. What broke the up-to-date checking is the dependency file generation. For the .c files generated by BIN2C the compile target created a .d file which indicated that the .ptx.o file has a dependency on the ptx.c file. And that dependency broke the normal make behavior with intermediate files. This patch compiles the BIN2C generated .c files without generating .d files. In turn the files do not longer need to be added to the .SECONDARY target in common.mak. When interested in those files for debugging, a line can be added to the corresponding Makefile like .SECONDARY: %.ptx.c %.ptx.gz Signed-off-by: softworkz --- ffbuild/commonmak: Fix rebuild check with implicit rule chains V2 == * Fix MSVC build (use the universal command pattern) V3 == * Skip dependency generation by clearing CC_DEPS instead (as suggested by Ramiro - thanks!) V4 == * Always keep .ptx files (as suggested by Timo - thanks) Tested all scenarios: * .ptx.c and .ptx.gz still get deleted (as intermediates) * repeated make shows "up-to-date" * removing a .ptx file does not cause a rebuild (it's still an intermediate, but an "intermediate to keep") * but changing a .ptx does (in case of dev/debugging) * changed .cu files always rebuild of course . Published-As: https://github.com/ffstaging/FFmpeg/releases/tag/pr-ffstaging-80%2Fsoftworkz%2Fsubmit_commonmak-v4 Fetch-It-Via: git fetch https://github.com/ffstaging/FFmpeg pr-ffstaging-80/softworkz/submit_commonmak-v4 Pull-Request: https://github.com/ffstaging/FFmpeg/pull/80 Range-diff vs v3: 1: 981329e5d9 ! 1: 20c2fb65ed ffbuild/commonmak: Fix rebuild check with implicit rule chains @@ ffbuild/common.mak: else # NO COMPRESSION clean:: $(RM) $(BIN2CEXE) $(CLEANSUFFIXES:%=ffbuild/%) -@@ ffbuild/common.mak: ALLHEADERS := $(subst $(SRC_DIR)/,$(SUBDIR),$(wildcard $(SRC_DIR)/*.h $(SRC_DIR) - SKIPHEADERS += $(ARCH_HEADERS:%=$(ARCH)/%) $(SKIPHEADERS-) +@@ ffbuild/common.mak: SKIPHEADERS += $(ARCH_HEADERS:%=$(ARCH)/%) $(SKIPHEADERS-) SKIPHEADERS := $(SKIPHEADERS:%=$(SUBDIR)%) HOBJS = $(filter-out $(SKIPHEADERS:.h=.h.o),$(ALLHEADERS:.h=.h.o)) --PTXOBJS = $(filter %.ptx.o,$(OBJS)) + PTXOBJS = $(filter %.ptx.o,$(OBJS)) -RESOURCEOBJS = $(filter %.css.o %.html.o,$(OBJS)) $(HOBJS): CCFLAGS += $(CFLAGS_HEADERS) checkheaders: $(HOBJS) -.SECONDARY: $(HOBJS:.o=.c) $(PTXOBJS:.o=.c) $(PTXOBJS:.o=.gz) $(PTXOBJS:.o=) $(RESOURCEOBJS:.o=.c) $(RESOURCEOBJS:%.css.o=%.css.min) $(RESOURCEOBJS:%.css.o=%.css.min.gz) $(RESOURCEOBJS:%.html.o=%.html.gz) $(RESOURCEOBJS:.o=) -+.SECONDARY: $(HOBJS:.o=.c) ++.SECONDARY: $(HOBJS:.o=.c) $(PTXOBJS:.o=) alltools: $(TOOLS) ffbuild/common.mak | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/ffbuild/common.mak b/ffbuild/common.mak index 0e1eb1f62b..f03b9ca051 100644 --- a/ffbuild/common.mak +++ b/ffbuild/common.mak @@ -139,6 +139,10 @@ else $(BIN2C) $(patsubst $(SRC_PATH)/%,$(SRC_LINK)/%,$<) $@ $(subst .,_,$(basename $(notdir $@))) endif +%.ptx.o: CCDEP = +%.ptx.o: CC_DEPFLAGS = + + # 1) Preprocess CSS to a minified version %.css.min: %.css # Must start with a tab in the real Makefile @@ -177,6 +181,10 @@ else # NO COMPRESSION $(BIN2C) $< $@ $(subst .,_,$(basename $(notdir $@))) endif +%.html.o %.css.o: CCDEP = +%.html.o %.css.o: CC_DEPFLAGS = + + clean:: $(RM) $(BIN2CEXE) $(CLEANSUFFIXES:%=ffbuild/%) @@ -229,10 +237,9 @@ SKIPHEADERS += $(ARCH_HEADERS:%=$(ARCH)/%) $(SKIPHEADERS-) SKIPHEADERS := $(SKIPHEADERS:%=$(SUBDIR)%) HOBJS = $(filter-out $(SKIPHEADERS:.h=.h.o),$(ALLHEADERS:.h=.h.o)) PTXOBJS = $(filter %.ptx.o,$(OBJS)) -RESOURCEOBJS = $(filter %.css.o %.html.o,$(OBJS)) $(HOBJS): CCFLAGS += $(CFLAGS_HEADERS) checkheaders: $(HOBJS) -.SECONDARY: $(HOBJS:.o=.c) $(PTXOBJS:.o=.c) $(PTXOBJS:.o=.gz) $(PTXOBJS:.o=) $(RESOURCEOBJS:.o=.c) $(RESOURCEOBJS:%.css.o=%.css.min) $(RESOURCEOBJS:%.css.o=%.css.min.gz) $(RESOURCEOBJS:%.html.o=%.html.gz) $(RESOURCEOBJS:.o=) +.SECONDARY: $(HOBJS:.o=.c) $(PTXOBJS:.o=) alltools: $(TOOLS) base-commit: 4099d53759ce5d9190a339c02b6bb486e2880f66 -- ffmpeg-codebot _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".