From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=104.47.2.89; helo=eur01-db5-obe.outbound.protection.outlook.com; envelope-from=evan.lloyd@arm.com; receiver=edk2-devel@lists.01.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0089.outbound.protection.outlook.com [104.47.2.89]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 62191202E53F2 for ; Thu, 28 Jun 2018 03:35:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector1-arm-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=04dgeC3PgWX7EGVMUA8d6YEaqP7teWSCxSrcVEBdRPg=; b=LukLfydBjWY2259dyiameuR5XfnQ5VBVSPMld1SlF15DpLvReRSYLFtGuow33dI2uSuB07QeyFvvsy7fakOSa/5Dt0xSdzSMeczrENPEzR9gJf6oT/78SvFHgJtf5xb2fbHX7UU2jp/pGpQDuCfKUxOaEdjxdHPINwM5QujYWSk= Received: from DB6PR08MB2806.eurprd08.prod.outlook.com (10.170.222.149) by DB6PR08MB2776.eurprd08.prod.outlook.com (10.170.222.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.906.20; Thu, 28 Jun 2018 10:35:09 +0000 Received: from DB6PR08MB2806.eurprd08.prod.outlook.com ([fe80::3121:feab:c41a:7885]) by DB6PR08MB2806.eurprd08.prod.outlook.com ([fe80::3121:feab:c41a:7885%3]) with mapi id 15.20.0884.024; Thu, 28 Jun 2018 10:35:09 +0000 From: Evan Lloyd To: Chris Co , "edk2-devel@lists.01.org" , Liming Gao Thread-Topic: [PATCH v1 1/1] BaseTools/Trim: Canonicalize filepaths to fix comparison Thread-Index: AQHUDcsNZUVBqOxBWkWwqrDKFPQJj6Rz8L2wgABoEeCAABL1AIAAGzbggADx+6A= Date: Thu, 28 Jun 2018 10:35:09 +0000 Message-ID: References: <20180627035753.49848-1-christopher.co@microsoft.com> <20180627035753.49848-2-christopher.co@microsoft.com> In-Reply-To: Accept-Language: en-GB, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Evan.Lloyd@arm.com; x-originating-ip: [217.140.96.140] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DB6PR08MB2776; 7:D+O2S5yDPNtK3r0Cm5ivx0RhEOcDIpU9w94njbfMpOGguSS+n1NBeq3Rr07rKj6MxpLVWVFmAUBx99FNQOoivDHtEChwQDLeC+XBjtqVpqkePHtPnWfmIY7y3xr7OQJzU18JGlPkgHRdlZGXAdLu++jDi+q3haBIbSvZVU494GmfP95JpcOFE3Ab4yYVF2DqhQo8nnowq6vwgIjgTDgfy58gdASt8aybHWU0WH+EMXU9eJIgrMHM4X/w/EhLe5tL x-ms-exchange-antispam-srfa-diagnostics: SOS;SOR; x-ms-office365-filtering-correlation-id: 5fb2e27a-8f81-4644-193e-08d5dce2d28f x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:(223705240517415); BCL:0; PCL:0; RULEID:(7020095)(4652020)(8989117)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600026)(711020)(48565401081)(2017052603328)(7153060)(7193020); SRVR:DB6PR08MB2776; x-ms-traffictypediagnostic: DB6PR08MB2776: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(180628864354917)(89211679590171)(166708455590820)(189930954265078)(223705240517415)(788757137089)(162533806227266)(219752817060721)(228905959029699); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(93006095)(93001095)(3231254)(944501410)(52105095)(3002001)(10201501046)(6055026)(149027)(150027)(6041310)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(6072148)(201708071742011)(7699016); SRVR:DB6PR08MB2776; BCL:0; PCL:0; RULEID:; SRVR:DB6PR08MB2776; x-forefront-prvs: 0717E25089 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(366004)(376002)(396003)(136003)(39860400002)(346002)(13464003)(40434004)(199004)(189003)(5250100002)(33656002)(25786009)(1511001)(6116002)(53936002)(14444005)(102836004)(97736004)(2900100001)(74316002)(3846002)(53546011)(99286004)(68736007)(186003)(66066001)(6506007)(7696005)(966005)(256004)(316002)(6246003)(4326008)(54906003)(305945005)(2501003)(575784001)(86362001)(5660300001)(7736002)(93886005)(5024004)(110136005)(106356001)(81166006)(476003)(8676002)(105586002)(81156014)(14454004)(76176011)(478600001)(486006)(55016002)(72206003)(11346002)(6436002)(26005)(229853002)(8936002)(446003)(45080400002)(6306002)(2906002)(9686003)(460985005); DIR:OUT; SFP:1101; SCL:1; SRVR:DB6PR08MB2776; H:DB6PR08MB2806.eurprd08.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: arm.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: Ihjn1KgEDzVWde6bpzVSBbi60QBMRI33W9wjgDueCxbwslCYBzVuP7I/7VmIRNR3SOKrp1muaB2ER/9Ll1g23Jw2ikMWeOAZjiESNoCHraBiI3PPsn507fn4AeNzbPHj3G7U1JhCEwpsnMgKoUonpsptK239FpHWpI9UKLI03n9eG2DU7+ue8Unifsmpa2USdgkO4sD3CVUrc4pSu4kw+EjkkfVeRDuvN+Jx9rlvvhlHvhOrTbesH6cv+NuWylORMChUPzhYwytwEJq9IChi+dzsa9BINoyS5VGUuvJkbInZszC8PxcR5RTQlBDwGLMRrK7ebKhSUYbzkul6z1YQNVhMR8RcLPOYIxTrzQdoYxs= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5fb2e27a-8f81-4644-193e-08d5dce2d28f X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jun 2018 10:35:09.5325 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR08MB2776 Subject: Re: [PATCH v1 1/1] BaseTools/Trim: Canonicalize filepaths to fix comparison X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jun 2018 10:35:12 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi Chris. > -----Original Message----- > From: Chris Co > Sent: 27 June 2018 21:03 > To: Evan Lloyd ; edk2-devel@lists.01.org; Liming Gao > > Cc: Leif Lindholm ; Sami Mujawar > > Subject: RE: [PATCH v1 1/1] BaseTools/Trim: Canonicalize filepaths to fix > comparison > > > -----Original Message----- > > From: Chris Co > > Sent: Wednesday, June 27, 2018 11:23 AM > > To: 'Evan Lloyd' ; 'edk2-devel@lists.01.org' > > ; 'Liming Gao' > > Cc: 'Leif Lindholm' ; Sami Mujawar > > > > Subject: RE: [PATCH v1 1/1] BaseTools/Trim: Canonicalize filepaths to > > fix comparison > > > > Forgot to add that I'll try out the os.path.normpath/normcase to see > > if this will work. > > > > Just tried out os.path.normpath and os.path.normcase and together, these > calls do achieve the desired result. > > Initial filepath string =3D > "e:\\rebase\\Build\\HUMMINGBOARD_EDGE_IMX6Q_2GB\\RELEASE_GCC49 > xASL\\ARM\\Platform\\SolidRun\\HUMMINGBOARD_EDGE_IMX6Q_2GB\\Ac > piTables\\AcpiTables\\OUTPUT\\.\\DSDT.i" > After normpath =3D > "e:\rebase\Build\HUMMINGBOARD_EDGE_IMX6Q_2GB\RELEASE_GCC49xAS > L\ARM\Platform\SolidRun\HUMMINGBOARD_EDGE_IMX6Q_2GB\AcpiTables > \AcpiTables\OUTPUT\DSDT.i" > After normcase =3D > "e:\rebase\build\hummingboard_edge_imx6q_2gb\release_gcc49xasl\arm\ > platform\solidrun\hummingboard_edge_imx6q_2gb\acpitables\acpitables\o > utput\dsdt.i" > > I would prefer to use the os module instead of my direct string manipulat= ion > approach so let me know if this change is acceptable and I can submit a v= 2 > using these functions instead. [[Evan Lloyd]] This is not my call but, as Leif asked me to stick my oar i= n, I'll say that I think it would be very acceptable. Of course, the guy to convince is Liming. Thank you, again. (Are you getting the idea I'm pleased with this?) Evan > > > > -----Original Message----- > > > From: Chris Co > > > Sent: Wednesday, June 27, 2018 11:13 AM > > > To: 'Evan Lloyd' ; edk2-devel@lists.01.org; > > > Liming Gao > > > Cc: Leif Lindholm ; Sami Mujawar > > > > > > Subject: RE: [PATCH v1 1/1] BaseTools/Trim: Canonicalize filepaths > > > to fix comparison > > > > > > Hi Liming, Evan, > > > > > > I have attached an example of a generated DSDT.iii file which gets > > > processed using Trim. It will give us a concrete example of what > > > these > > changes do. > > > > > > The first line has its #line directive stripped and the filepath > > > saved as the PreProcessedFile. In GCC49, the filepath was: > > > > > > "e:\\rebase\\Build\\HUMMINGBOARD_EDGE_IMX6Q_2GB\\RELEASE_GCC4 > > > > > > 9xASL\\ARM\\Platform\\SolidRun\\HUMMINGBOARD_EDGE_IMX6Q_2GB\\ > > > AcpiTables\\AcpiTables\\OUTPUT\\.\\DSDT.i" > > > > > > while in GCC5+ it is: > > > > > > "e:\\rebase\\build\\hummingboard_edge_imx6q_2gb\\release_gcc5\\arm\ > > > > > > \platform\\solidrun\\hummingboard_edge_imx6q_2gb\\acpitables\\acpitab > > > les\\output\\dsdt.i" > > > > > > So there is a difference in both lowercase as well as \\.\\ before ds= dt.i. > > > > > > As the Trim function goes through each line, it strips the #line > > > directive and saves the filepath as InjectedFile, which is then > > > compared against PreProcessedFile > > > > > > (https://github.com/tianocore/edk2/blob/975478f6bb22668efae311eb3f740 > > > 6e1f18411c2/BaseTools/Source/Python/Trim/Trim.py#L174) > > > If it is not a match, skip to next line. When using GCC5+, > > > DSDT.iii's #line directives after the first keeps the old GCC49 > > > filepath syntax so the string comparison always fails. An example > > > of a line which should match line 602 in DSDT.iii. > > > > > > So my changes target these two cases directly, but admittedly I'm > > > more of a kernel dev than a python dev so if there is a better way > > > to address this, I'm all for it. > > > > > > > -----Original Message----- > > > > From: Evan Lloyd > > > > Sent: Wednesday, June 27, 2018 4:35 AM > > > > To: Chris Co ; > > > > edk2-devel@lists.01.org > > > > Cc: Liming Gao ; Leif Lindholm > > > > ; Sami Mujawar > > > > Subject: RE: [PATCH v1 1/1] BaseTools/Trim: Canonicalize filepaths > > > > to fix comparison > > > > > > > > Hi Chris. > > > > Firstly, thank you: this is a useful, pragmatic solution to an > > > > major > > > annoyance. > > > > I personally think it unfortunate that the GCC guys can't be > > > > bothered to fix their compiler, but ... > > > > > > > > > -----Original Message----- > > > > > From: edk2-devel On Behalf Of > > > > > Chris Co > > > > > Sent: 27 June 2018 04:58 > > > > > To: edk2-devel@lists.01.org > > > > > Cc: Liming Gao > > > > > Subject: [edk2] [PATCH v1 1/1] BaseTools/Trim: Canonicalize > > > > > filepaths to fix comparison > > > > > > > > > > When using Linaro GCC5+ arm-eabi toolchain on Windows, the > > > > > generated DSDT.iii contains a canonicalized ("\.\" removed and > > > > > lower case) filepath for the preprocessed DSDT.i file in the firs= t line. > > > > > Due to this, when Trim.exe is called to generate DSDT.iiii, > > > > > future filepath comparisons against this canonicalized filepath, > > > > > which should match, actually fail the comparison which results > > > > > in an empty > > > DSDT.iiii. > > > > > > > > > > Issue was first reported to Linaro here: > > > > > > > > > > > > > > https://na01.safelinks.protection.outlook.com/?url=3Dhttps%3A%2F%2Fbugs= . > > > > > > > > > > > > > > > linaro.org%2Fshow_bug.cgi%3Fid%3D2909&data=3D02%7C01%7CChristop > > > > her.C > > > > > > > > > > > > > > > o%40microsoft.com%7C2abbef5e0163411f08e708d5dc220678%7C72f988bf8 > 6 > > > > f141a > > > > > > > > > > > > > > > f91ab2d7cd011db47%7C1%7C0%7C636656961074375810&sdata=3D%2FvF > v > > > > maBD0ul > > > > > z89CY%2BMaOpwvpTvK9%2FxXjeZeSiXUCYH0%3D&reserved=3D0 > > > > > where the recommendation was to address the issue in Trim.exe. > > > > > > > > > > This patch canonicalizes and lower cases all file paths > > > > > encountered during trim execution on preprocessed files. Since > > > > > file paths are standarized, the comparison succeeds for files > > > > > that should match regardless of the presence of upper case or "\.= \" > > > > > characters in the file > > > path. > > > > > > > > > > Contributed-under: TianoCore Contribution Agreement 1.1 > > > > > Signed-off-by: Christopher Co > > > > > Cc: Leif Lindholm > > > > > Cc: Yonghong Zhu > > > > > Cc: Liming Gao > > > > > --- > > > > > BaseTools/Source/Python/Trim/Trim.py | 2 ++ > > > > > 1 file changed, 2 insertions(+) > > > > > > > > > > diff --git a/BaseTools/Source/Python/Trim/Trim.py > > > > > b/BaseTools/Source/Python/Trim/Trim.py > > > > > index a74075859148..cca4e5c9694a 100644 > > > > > --- a/BaseTools/Source/Python/Trim/Trim.py > > > > > +++ b/BaseTools/Source/Python/Trim/Trim.py > > > > > @@ -166,6 +166,8 @@ def TrimPreprocessedFile(Source, Target, > > > > > ConvertHex, > > > > > TrimLong): > > > > > if len(MatchList) =3D=3D 2: > > > > > LineNumber =3D int(MatchList[0], 0) > > > > > InjectedFile =3D MatchList[1] > > > > > + InjectedFile =3D InjectedFile.replace("\\.\\",""= ) > > > > > > > > [[Evan Lloyd]] I've not actually tried this yet, but it looks > > > > surprizing. I'd have expected InjectedFile.replace("\\.\\","\\"). > > > > Can I ask how it works, please? Have I missed something? > > > > [[Evan Lloyd]] Would it be possible to achieve the same effect > > > > with os.path.normpath (see Common/LongFilePathOsPath.py imported > > > > via > > line > > > > 17)? > > > > > > > > > + InjectedFile =3D InjectedFile.lower() > > > > [[Evan Lloyd]] Similarly, there is "os.path.normcase" - but that > > > > may not get the comparison working (because it converts '/' to '\' > > > > on > > Windows). > > > > > > > > > # The first injetcted file must be the preproces= sed file itself > > > > > if PreprocessedFile =3D=3D "": > > > > > PreprocessedFile =3D InjectedFile > > > > > -- > > > > > 2.16.2.gvfs.1.33.gf5370f1 > > > > > > > > > > _______________________________________________ > > > > > edk2-devel mailing list > > > > > edk2-devel@lists.01.org > > > > > https://na01.safelinks.protection.outlook.com/?url=3Dhttps%3A%2F%= 2 > > > > > Fl > > > > > is > > > > > ts > > > > > .01.org%2Fmailman%2Flistinfo%2Fedk2- > > > > devel&data=3D02%7C01%7CChristoph > > > > > > > > > > > > > > > er.Co%40microsoft.com%7C2abbef5e0163411f08e708d5dc220678%7C72f988 > > > > bf86f > > > > > > > > > > > > > > > 141af91ab2d7cd011db47%7C1%7C0%7C636656961074385815&sdata=3Du > u > > > > S9M90lN > > > > > ewzqS6ScNwbSm8xC9wpdzAFVZhjEu8w2kk%3D&reserved=3D0 > > > > IMPORTANT NOTICE: The contents of this email and any attachments > > > > are confidential and may also be privileged. If you are not the > > > > intended recipient, please notify the sender immediately and do > > > > not disclose the contents to any other person, use it for any > > > > purpose, or store or copy the information in any medium. Thank you. IMPORTANT NOTICE: The contents of this email and any attachments are confid= ential and may also be privileged. If you are not the intended recipient, p= lease notify the sender immediately and do not disclose the contents to any= other person, use it for any purpose, or store or copy the information in = any medium. Thank you.