From nobody Wed Nov 15 22:33:51 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SVyd86YGPz50qTV for ; Wed, 15 Nov 2023 22:34:04 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SVyd81c0cz3Jlx for ; Wed, 15 Nov 2023 22:34:04 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20230601.gappssmtp.com header.s=20230601 header.b=dvqbYMot; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2a00:1450:4864:20::52a) smtp.mailfrom=wlosh@bsdimp.com; dmarc=none Received: by mail-ed1-x52a.google.com with SMTP id 4fb4d7f45d1cf-540c54944c4so326148a12.1 for ; Wed, 15 Nov 2023 14:34:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1700087643; x=1700692443; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=yWGfgFEPlsVtk6nPfPgf+BV6QhRgBi4AZ3Ru88/QiZc=; b=dvqbYMot2DZQwI+Z2YotzmD58bDdQ2tGk0mK0/e4B7Szye0TyhXQeBPsbTtf/DXuPq 0a1zHPlKCqMgaXmGAwPu+bjoPJor/5drnVJ2KYFM4s82xPUzQhpbKeufBj9FfXeHGtPu 2li0gERWlXtT1NdsPIyD8O53/ZiTyLzf51qcf5VAXYPaWuqJLqhQSFwdQWGdQeDkX/8D NwicSV/Xp7Y3kQzzm9W/vo3aCLQ/2GaTqrEh9hWfYjiKWq9RGD+zuiO3BLukFnBfXSFz dseoWei02A0YZb2/Dnpy6/eaYl+6Jy4ebJPzM7xy/XklhNbPNFJgzt2vA777kyqYkix0 lJZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700087643; x=1700692443; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=yWGfgFEPlsVtk6nPfPgf+BV6QhRgBi4AZ3Ru88/QiZc=; b=JQUG1iJTxg3uHpaetuqz0I3URqI3r6m3R3oGTBSCUgxRSGhcOsnrhE3VlBYdkv1FAP 7DHXrE5NMBTD3qVFiTvYH2SrhpP6dfIp8JDnnCp53HYRuLWiud/aAcgNTsZNKPXjX0RK PN1Wp2EKg5VCwalK1W/RQ/FA0mqSmw13Dc4W7XFtrxKytg0mLiYUFKiqtir12AE276GN iXpvWxFNopVZW/Tu6lG0jHlSvvBbrlyCicbIwkatEvtA9K4v8YCq7D7VVkundyDqgGZq VCXLOp2BM3gW2I6fJKj8MxiptoG+1r0yXVigeEVUu1kXmB3djNFaQZ8POtgJA3PIoJ7T XxBA== X-Gm-Message-State: AOJu0YwCSyNP/n5eD7Mteh+SHjvS3toAtVaZcGBTDl279txqR86CcEuK 3WhcMKAz3Y3HFc3kZ5/ws5/zRR4rwLuhgamCWlsJow== X-Google-Smtp-Source: AGHT+IFS9OyKnhf9BycTxn/pcV2I6Cac2XIbe+V4k9FlXTO2HUTuP8DtBK1ABuwW29Qv03xH1d/TtzRZOzIUFmqSEU0= X-Received: by 2002:a05:6402:115a:b0:53d:b59c:8f8d with SMTP id g26-20020a056402115a00b0053db59c8f8dmr6369150edw.8.1700087642885; Wed, 15 Nov 2023 14:34:02 -0800 (PST) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <202311140451.3AE4p5AR014207@gitrepo.freebsd.org> In-Reply-To: From: Warner Losh Date: Wed, 15 Nov 2023 15:33:51 -0700 Message-ID: Subject: Re: git: 3fd60a6b73ac - main - awk: Merge upstream 2nd Edition Awk Book To: Jessica Clarke Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Type: multipart/alternative; boundary="0000000000000aa0ab060a388086" X-Spamd-Result: default: False [-2.99 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.99)[-0.995]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20230601.gappssmtp.com:s=20230601]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; RCVD_COUNT_ONE(0.00)[1]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::52a:from]; RCVD_TLS_LAST(0.00)[]; R_SPF_NA(0.00)[no SPF record]; TO_DN_EQ_ADDR_SOME(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20230601.gappssmtp.com:+]; RCPT_COUNT_THREE(0.00)[4]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-all@freebsd.org]; TO_DN_SOME(0.00)[]; DMARC_NA(0.00)[bsdimp.com]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com] X-Rspamd-Queue-Id: 4SVyd81c0cz3Jlx X-Spamd-Bar: -- --0000000000000aa0ab060a388086 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, Nov 15, 2023 at 3:20=E2=80=AFPM Warner Losh wrote: > > > On Wed, Nov 15, 2023 at 3:13=E2=80=AFPM Jessica Clarke wrote: > >> On 15 Nov 2023, at 21:59, Warner Losh wrote: >> > >> > >> > >> > On Wed, Nov 15, 2023 at 9:52=E2=80=AFAM Jessica Clarke >> wrote: >> >> On 14 Nov 2023, at 04:51, Warner Losh wrote: >> >> > >> >> > The branch main has been updated by imp: >> >> > >> >> > URL: >> https://cgit.FreeBSD.org/src/commit/?id=3D3fd60a6b73ac01a72df89751f17397= 0fae4cae73 >> >> > >> >> > commit 3fd60a6b73ac01a72df89751f173970fae4cae73 >> >> > Merge: 194df014feeb 2e406c584fe4 >> >> > Author: Warner Losh >> >> > AuthorDate: 2023-11-02 16:32:01 +0000 >> >> > Commit: Warner Losh >> >> > CommitDate: 2023-11-14 04:49:34 +0000 >> >> > >> >> > awk: Merge upstream 2nd Edition Awk Book >> >> > >> >> > Merge in the November 2nd, 2023 version of one true awk. >> >> > >> >> > This brings in Unicode support, CSV support and a number of bug >> fixes. >> >> > >> >> > Sponsored by: Netflix >> >> > Reviewed by: delphij >> >> > Differential Revision: https://reviews.freebsd.org/D42447 >> >> >> >> This seems to have broken the GitHub CI for cross-building; contrast: >> >> >> >> https://github.com/freebsd/freebsd-src/actions/runs/6859373313 >> >> >> >> with: >> >> >> >> https://github.com/freebsd/freebsd-src/actions/runs/6859316228 >> >> >> >> Has this broken makeobjops.awk somehow? If so it should be reproducib= le >> >> on FreeBSD with BOOTSTRAP_ALL_TOOLS=3D1, or by rebuilding on an updat= ed >> >> system. Cross-building will just show it first because we always >> >> bootstrap awk there, like many other tools. >> > >> > It worked when it was the system awk for me... But that might not be >> the most >> > helpful observation. >> >> For a clean kernel build? >> >> > Why didn't it work for you/github's ci runs? >> >> From GitHub (indentation sadly lost when copying): >> >> > In file included from >> /Users/runner/work/freebsd-src/freebsd-src/sys/cam/cam.c:45: >> > In file included from >> /Users/runner/work/freebsd-src/freebsd-src/sys/cam/cam_ccb.h:1052: >> > In file included from >> /Users/runner/work/freebsd-src/freebsd-src/sys/cam/mmc/mmc_bus.h:4: >> > In file included from >> /Users/runner/work/freebsd-src/freebsd-src/sys/dev/mmc/bridge.h:57: >> > In file included from >> /Users/runner/work/freebsd-src/freebsd-src/sys/sys/bus.h:787: >> > ./bus_if.h:217:35: error: expected ')' >> > int _unit); >> > ^ >> > ./bus_if.h:216:33: note: to match this '(' >> > typedef device_t bus_add_child_t(device_t _dev, u_int _order, const >> char *_name >> > ^ >> > ./bus_if.h:241:41: error: expected ')' >> > const char *_name, int _unit) >> > ^ >> > ./bus_if.h:240:39: note: to match this '(' >> > static __inline device_t BUS_ADD_CHILD(device_t _dev, u_int _order >> > ^ >> > ... >> >> Hence the assumption that makeobjops.awk has stopped working properly, >> which is highly consistent with this being the first commit to fail in >> CI. It looks like we=E2=80=99re missing commas, maybe from format_line. >> >> I haven=E2=80=99t tried to reproduce it locally, but given it=E2=80=99s = across all >> macOS and Ubuntu versions I would be surprised if I couldn=E2=80=99t. >> >> > makeobjops.awk doesn't have any of the issues that I know are minor >> changes >> > in awk. I'll add it to the list of things to look into, though. >> >> On what timeline? If not soon, can we please revert the import as it=E2= =80=99s >> breaking important things and thus not ready for the tree? >> > > I wanted to try to recreate it, or figure out what in the env is causing = it > to go astray. I also want to confirm your diagnosis that this is coming > from this awk and not because we're building it to a weird new name > (so all my testing is with the old awk) and thus falling back to using > the system's awk... > > I don't like mysteries.... but if we still have one after spending > an hour or two on it, I'll revert. That puts it at anywhere from an hour > or two from now, or first thing in the morning worst case (eg, something > crazy comes up... though the odds of that are low). Otherwise I'll > commit a fix. > OK. As near as I can tell my pre-push testing was with the old-awk and old-test suite. The new awk with the new test suite shows the bigs. I think I did the tests from the wrong checked out tree, but I'm still trying to prove that to myself (I remember the results I got, and they only match old-awk + old-testsuite, not new-awk + new-testsuite). Sorry for the hassle this sloppiness has caused. Warner > Warner > > >> Jess >> >> > I also broke the Jenkins CI run, but not 'make check' for reasons I >> don't >> > understand. >> > >> > Warner >> >> >> --0000000000000aa0ab060a388086 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Wed, Nov 15, 2023 at 3:20=E2=80=AF= PM Warner Losh <imp@bsdimp.com>= wrote:


On Wed, Nov 15, 2023 at 3:13=E2=80=AFPM Jessi= ca Clarke <jrtc2= 7@freebsd.org> wrote:
On 15 Nov 2023, at 21:59, Warner Losh <imp@bsdimp.com> wrote:
>
>
>
> On Wed, Nov 15, 2023 at 9:52=E2=80=AFAM Jessica Clarke <jrtc27@freebsd.org> wro= te:
>> On 14 Nov 2023, at 04:51, Warner Losh <imp@FreeBSD.org> wrot= e:
>> >
>> > The branch main has been updated by imp:
>> >
>> > URL: https://cgit.FreeBSD.org/src/commit/?id=3D3fd60a6b73ac01a72df89751f173970f= ae4cae73
>> >
>> > commit 3fd60a6b73ac01a72df89751f173970fae4cae73
>> > Merge: 194df014feeb 2e406c584fe4
>> > Author:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>= ;
>> > AuthorDate: 2023-11-02 16:32:01 +0000
>> > Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>= ;
>> > CommitDate: 2023-11-14 04:49:34 +0000
>> >
>> >=C2=A0 =C2=A0 awk: Merge upstream 2nd Edition Awk Book
>> >
>> >=C2=A0 =C2=A0 Merge in the November 2nd, 2023 version of one t= rue awk.
>> >
>> >=C2=A0 =C2=A0 This brings in Unicode support, CSV support and = a number of bug fixes.
>> >
>> >=C2=A0 =C2=A0 Sponsored by:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0Netflix
>> >=C2=A0 =C2=A0 Reviewed by:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 delphij
>> >=C2=A0 =C2=A0 Differential Revision:=C2=A0 https://re= views.freebsd.org/D42447
>>
>> This seems to have broken the GitHub CI for cross-building; contra= st:
>>
>> https://github.com/freebsd/fr= eebsd-src/actions/runs/6859373313
>>
>> with:
>>
>> https://github.com/freebsd/fr= eebsd-src/actions/runs/6859316228
>>
>> Has this broken makeobjops.awk somehow? If so it should be reprodu= cible
>> on FreeBSD with BOOTSTRAP_ALL_TOOLS=3D1, or by rebuilding on an up= dated
>> system. Cross-building will just show it first because we always >> bootstrap awk there, like many other tools.
>
> It worked when it was the system awk for me...=C2=A0 But that might no= t be the most
> helpful observation.

For a clean kernel build?

> Why didn't it work for you/github's ci runs?

From GitHub (indentation sadly lost when copying):

> In file included from /Users/runner/work/freebsd-src/freebsd-src/sys/c= am/cam.c:45:
> In file included from /Users/runner/work/freebsd-src/freebsd-src/sys/c= am/cam_ccb.h:1052:
> In file included from /Users/runner/work/freebsd-src/freebsd-src/sys/c= am/mmc/mmc_bus.h:4:
> In file included from /Users/runner/work/freebsd-src/freebsd-src/sys/d= ev/mmc/bridge.h:57:
> In file included from /Users/runner/work/freebsd-src/freebsd-src/sys/s= ys/bus.h:787:
> ./bus_if.h:217:35: error: expected ')'
> int _unit);
> ^
> ./bus_if.h:216:33: note: to match this '('
> typedef device_t bus_add_child_t(device_t _dev, u_int _order, const ch= ar *_name
> ^
> ./bus_if.h:241:41: error: expected ')'
> const char *_name, int _unit)
> ^
> ./bus_if.h:240:39: note: to match this '('
> static __inline device_t BUS_ADD_CHILD(device_t _dev, u_int _order > ^
> ...

Hence the assumption that makeobjops.awk has stopped working properly,
which is highly consistent with this being the first commit to fail in
CI. It looks like we=E2=80=99re missing commas, maybe from format_line.

I haven=E2=80=99t tried to reproduce it locally, but given it=E2=80=99s acr= oss all
macOS and Ubuntu versions I would be surprised if I couldn=E2=80=99t.

> makeobjops.awk doesn't have any of the issues that I know are mino= r changes
> in awk. I'll add it to the list of things to look into, though.
On what timeline? If not soon, can we please revert the import as it=E2=80= =99s
breaking important things and thus not ready for the tree?
=

I wanted to try to recreate it, or figure out what in t= he env is causing it
to go astray. I also want to confirm your di= agnosis that this is coming
from this awk and not because we'= re building it to a weird new name
(so all my testing is with the= old awk) and thus falling back to using
the system's awk...<= /div>

I don't like mysteries.... but if we still hav= e one after spending
an hour or two on it, I'll revert. That = puts it at anywhere from an hour
or two from now, or first thing = in the morning worst case (eg, something
crazy comes up... though= the odds of that are low).=C2=A0 Otherwise I'll
commit a fix= .

OK. As near as I can te= ll my pre-push testing was with the old-awk and old-test suite.
T= he new awk with the new test suite shows the bigs. I think I did the tests = from
the wrong checked out tree, but I'm still trying to prov= e that to myself (I remember the
results I got, and they only mat= ch old-awk=C2=A0+ old-testsuite, not new-awk + new-testsuite).
Sorry for the hassle this sloppiness has caused.
Warner
=C2=A0
Warner
=C2=A0
Jess

> I also broke the Jenkins CI run, but not 'make check' for reas= ons I don't
> understand.
>
> Warner


--0000000000000aa0ab060a388086--