From debbugs-submit-bounces@debbugs.gnu.org Fri Aug 25 23:04:17 2023 Received: (at submit) by debbugs.gnu.org; 26 Aug 2023 03:04:17 +0000 Received: from localhost ([127.0.0.1]:41326 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qZjaz-0003lG-4b for submit@debbugs.gnu.org; Fri, 25 Aug 2023 23:04:17 -0400 Received: from lists.gnu.org ([2001:470:142::17]:46564) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qZjaw-0003kz-9r for submit@debbugs.gnu.org; Fri, 25 Aug 2023 23:04:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qZjal-0003b5-Nt for guix-patches@gnu.org; Fri, 25 Aug 2023 23:04:03 -0400 Received: from mail.envs.net ([5.199.136.28]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qZjag-00063R-O7 for guix-patches@gnu.org; Fri, 25 Aug 2023 23:04:02 -0400 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id A5D9338A0135; Sat, 26 Aug 2023 03:03:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1693019035; bh=7jFTRjXkoVRTmZGv+Zl5PjfIOquTzNCqkcUH2uLBlJs=; h=From:To:Cc:Subject:Date:From; b=oqd57hKlFIQhqh3HSU93V2jZW5ppaRrmPknC6VaA53eMqDGLZ3BVQjOFe1eytun1H /kC4aykYEvnioyaHi+VeDTUgPfd37shdJe/mucbaPn2LMPudlVJ/eISlHYoRAaEJKD Qe1tEeRc9DyGKpNlL1sKQ/suq8n7e71fhl6LOINSU2QmA/uk+u8wJ+5aALZVPKMS8d 91Kj0Y9MfTnBLIAm4pjLovEqgzpiD21THLL2dAjW6BuSgbL/+67+De9S85+ybRVPbl QW6B6UqTuJ4JJRwxgnO+HMRdSCQ5AqWGKLQjFOqdVz9tRqfRwLLmqjLJXvzcQ+DoHf kMgqfKAldU6OgYXzrgGkmsL3PUclrG9CL0Cd3+TnWSlhroKeMh0ljhqTn4TB8bVfy8 ljEKr8zCZNkrMbhpmw7RLD/ttQPlVOLtTNYDB3p/fkV2DPnMAGyLgWttpzH2yUvvog 6E/LtbSmvJj5RqFdtuttZ5d1/1UBRvgIJ8XfCRehTCU7d/kVoiEj4cXU0UvXb0KX1P YRFAIEGhivA+HIFs2s6sOV6Ie0KZ1IKz5sfKZHkEZSLYWSiwwY6rJwJLgnl7Udh17a oRWrvo2s2Y92zc8cei2zK6sbF9lFWLFc6OdGzTUFZxNVTSRIbzH7FlHqCJKgYjlh1N YMW95+hljMto/IScO/JVOM7w= X-Virus-Scanned: Debian amavisd-new at mail.envs.net Received: from mail.envs.net ([127.0.0.1]) by localhost (mail.envs.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 60tfTiGDKpuW; Sat, 26 Aug 2023 03:03:51 +0000 (UTC) Received: from localhost (unknown [36.170.44.50]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.envs.net (Postfix) with ESMTPSA; Sat, 26 Aug 2023 03:03:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 00487b26; Sat, 26 Aug 2023 03:04:09 +0000 (UTC) From: iyzsong@envs.net To: guix-patches@gnu.org Subject: [PATCH] gnu: intel-xed: Update to 2023.08.21. Date: Sat, 26 Aug 2023 11:04:04 +0800 Message-ID: <5365959605f2d6878cd124cd3938b84d26a05ddc.1693019039.git.iyzsong@member.fsf.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=5.199.136.28; envelope-from=iyzsong@envs.net; helo=mail.envs.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) X-Debbugs-Envelope-To: submit Cc: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) From: 宋文武 * gnu/packages/assembly.scm (intel-xed): Update to 2023.08.21. [source]: Remove patches. [native-inputs]: Remove tcsh. Update mbuild to 2022.07.28. * gnu/packages/patches/intel-xed-fix-nondeterminism.patch: Remove file * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/assembly.scm | 18 ++- .../intel-xed-fix-nondeterminism.patch | 113 ------------------ 3 files changed, 7 insertions(+), 125 deletions(-) delete mode 100644 gnu/packages/patches/intel-xed-fix-nondeterminism.patch diff --git a/gnu/local.mk b/gnu/local.mk index ee4567c857..99145efbd9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1407,7 +1407,6 @@ dist_patch_DATA = \ %D%/packages/patches/imagemagick-WriteTHUMBNAILImage-fix.patch \ %D%/packages/patches/inkscape-poppler-compat.patch \ %D%/packages/patches/instead-use-games-path.patch \ - %D%/packages/patches/intel-xed-fix-nondeterminism.patch \ %D%/packages/patches/intltool-perl-compatibility.patch \ %D%/packages/patches/iputils-libcap-compat.patch \ %D%/packages/patches/irrlicht-use-system-libs.patch \ diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm index 4494c475ce..81e38c3f41 100644 --- a/gnu/packages/assembly.scm +++ b/gnu/packages/assembly.scm @@ -470,20 +470,18 @@ (define-public armips (define-public intel-xed (package (name "intel-xed") - (version "12.0.1") + (version "2023.08.21") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/intelxed/xed") - (commit version))) - (sha256 (base32 "07zfff8zf29c2n0wal87hiqfq3cwcjn80zz78mz0nyjfj09nd39f")) - (file-name (git-file-name name version)) - (patches (search-patches "intel-xed-fix-nondeterminism.patch")))) + (commit (string-append "v" version)))) + (sha256 (base32 "1zv99m5h3n3w6jcpplznq030s5mlwg5llz3vgfwpfl5l8laz1032")) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs `(("python" ,python-wrapper) - ("tcsh" ,tcsh) ;; As of the time of writing this comment, mbuild does not exist in the ;; Python Package Index and seems to only be used by intel-xed, so we ;; opt to include it here instead of packaging separately. Note also @@ -491,15 +489,15 @@ (define-public intel-xed ;; reference the "version" variable from setup.py instead. ("mbuild" ,(let ((name "mbuild") - (version "0.2496")) + (version "2022.07.28")) (origin (method git-fetch) (uri (git-reference (url "https://github.com/intelxed/mbuild") - (commit "3de3f0d753c11dbe634bec611d4cc13f74768e4f"))) + (commit (string-append "v" version)))) (sha256 (base32 - "0z8hdhpmk8y5c9429p2yns9daswnffbprni9czkq3vij8f58lkg4")) + "0rc9xp202yqw42bwgylwxvfvjr1crdl50qvv8vzfczyvlf4wflcx")) (file-name (git-file-name name version))))))) (outputs '("out" "lib")) (arguments @@ -585,5 +583,3 @@ (define-public neon2sse SSE4.2) intrinsic functions as defined in corresponding x86 compilers headers files.") (license license:bsd-2)))) - - diff --git a/gnu/packages/patches/intel-xed-fix-nondeterminism.patch b/gnu/packages/patches/intel-xed-fix-nondeterminism.patch deleted file mode 100644 index c81bd0edde..0000000000 --- a/gnu/packages/patches/intel-xed-fix-nondeterminism.patch +++ /dev/null @@ -1,113 +0,0 @@ -This patch removes sources of build non-determinism in the upstream sources. - -In particular, many of the compiled sources are generated with Python code, -which in turn uses dictionaries to index the output C functions. However, -iterators over Python dictionaries have no guaranteed order, thus resulting in -the C functions being output in a random order between builds. - -The patch below fixes this by forcing an order during output in several key -places. Note, however, that future updates may uncover new such places that -just happen to be non-problematic at the time of this patch. If you are -reading this due to finding such issues, feel free to contact me at -elaexuotee@wilsonb.com for help. - -diff --git a/pysrc/ild_codegen.py b/pysrc/ild_codegen.py -index 628ec45..a9bff79 100755 ---- a/pysrc/ild_codegen.py -+++ b/pysrc/ild_codegen.py -@@ -188,14 +188,14 @@ def gen_l2_func_list(agi, target_nt_dict, arg_nt_dict, - ild_t_member): - """generate L2 functions""" - l2_func_list = [] -- for (nt_name,array) in target_nt_dict.items(): -+ for (nt_name,array) in sorted(target_nt_dict.items()): - target_opname = array.get_target_opname() - if array.is_const_lookup_fun(): - fo = gen_const_l2_function(agi, nt_name, - target_opname, ild_t_member) - l2_func_list.append(fo) - else: -- for arg_nt_seq,arg_arr in arg_nt_dict.items(): -+ for arg_nt_seq,arg_arr in sorted(arg_nt_dict.items()): - fo = gen_scalable_l2_function(agi, nt_name, - target_opname, ild_t_member, arg_arr, list(arg_nt_seq)) - l2_func_list.append(fo) -diff --git a/pysrc/ild_disp.py b/pysrc/ild_disp.py -index 942c036..cf80e29 100755 ---- a/pysrc/ild_disp.py -+++ b/pysrc/ild_disp.py -@@ -350,7 +350,8 @@ def work(agi, united_lookup, disp_nts, brdisp_nts, ild_gendir, - disp_dict = _gen_l3_array_dict(agi, disp_nts, _disp_token) - - -- nt_arr_list = list(brdisp_dict.values()) + list(disp_dict.values()) -+ nt_arr_list = ([v for (k,v) in sorted(brdisp_dict.items())] + -+ [v for (k,v) in sorted(disp_dict.items())]) - #create function that calls all initialization functions - init_f = ild_nt.gen_init_function(nt_arr_list, 'xed_ild_disp_l3_init') - -@@ -367,7 +368,7 @@ def work(agi, united_lookup, disp_nts, brdisp_nts, ild_gendir, - l2_functions = [] - eosz_op = ild_eosz.get_target_opname() - easz_op = ild_easz.get_target_opname() -- for nt_name,array in list(disp_dict.items()) + list(brdisp_dict.items()): -+ for nt_name,array in sorted(disp_dict.items()) + sorted(brdisp_dict.items()): - #Some DISP NTs depend on EOSZ, others on EASZ, we need to know - #that when we generate L2 functions - if eosz_op in array.get_arg_names(): -diff --git a/pysrc/ild_easz.py b/pysrc/ild_easz.py -index 02cd691..c53b9f2 100755 ---- a/pysrc/ild_easz.py -+++ b/pysrc/ild_easz.py -@@ -165,9 +165,10 @@ def work(agi, united_lookup, easz_nts, ild_gendir, debug): - return - nt_seq_arrays[tuple(nt_seq)] = array - #init function calls all single init functions for the created tables -- init_f = ild_nt.gen_init_function(list(nt_seq_arrays.values()), -+ nt_seq_values = [v for (k,v) in sorted(nt_seq_arrays.items())] -+ init_f = ild_nt.gen_init_function(nt_seq_values, - 'xed_ild_easz_init') -- ild_nt.dump_lu_arrays(agi, list(nt_seq_arrays.values()), _easz_c_fn, -+ ild_nt.dump_lu_arrays(agi, nt_seq_values, _easz_c_fn, - mbuild.join('include-private', _easz_header_fn), - init_f) - getter_fos = [] -diff --git a/pysrc/ild_eosz.py b/pysrc/ild_eosz.py -index 6643bc3..89d2d89 100755 ---- a/pysrc/ild_eosz.py -+++ b/pysrc/ild_eosz.py -@@ -200,10 +200,11 @@ def work(agi, united_lookup, eosz_nts, ild_gendir, debug): - return None - nt_seq_arrays[tuple(nt_seq)] = array - #init function calls all single init functions for the created tables -- init_f = ild_nt.gen_init_function(list(nt_seq_arrays.values()), -+ nt_seq_values = [v for (k,v) in sorted(nt_seq_arrays.items())] -+ init_f = ild_nt.gen_init_function(nt_seq_values, - 'xed_ild_eosz_init') - #dump init and lookup functions for EOSZ sequences -- ild_nt.dump_lu_arrays(agi, list(nt_seq_arrays.values()), _eosz_c_fn, -+ ild_nt.dump_lu_arrays(agi, nt_seq_values, _eosz_c_fn, - mbuild.join('include-private', _eosz_header_fn), - init_f) - #generate EOSZ getter functions - they get xed_decoded_inst_t* -diff --git a/pysrc/ild_imm.py b/pysrc/ild_imm.py -index 51c413c..0530bae 100755 ---- a/pysrc/ild_imm.py -+++ b/pysrc/ild_imm.py -@@ -322,12 +322,14 @@ def work(agi, united_lookup, imm_nts, ild_gendir, eosz_dict, - level='l3') - nt_dict[nt_name] = array - -+ nt_dict_values = [v for (k,v) in sorted(nt_dict.items())] -+ - #create function that calls all initialization functions for L3 -- init_f = ild_nt.gen_init_function(list(nt_dict.values()), -+ init_f = ild_nt.gen_init_function(nt_dict_values, - 'xed_ild_imm_l3_init') - - #dump L3 functions -- ild_nt.dump_lu_arrays(agi, list(nt_dict.values()), _l3_c_fn, -+ ild_nt.dump_lu_arrays(agi, nt_dict_values, _l3_c_fn, - mbuild.join('include-private',_l3_header_fn), - init_f) - base-commit: d17eea747277643811134f9a33b534e58160688f -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 28 06:55:02 2023 Received: (at 65542-done) by debbugs.gnu.org; 28 Aug 2023 10:55:02 +0000 Received: from localhost ([127.0.0.1]:47183 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qaZte-0006tR-Er for submit@debbugs.gnu.org; Mon, 28 Aug 2023 06:55:02 -0400 Received: from mail.envs.net ([5.199.136.28]:41098) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qaZtb-0006t7-US for 65542-done@debbugs.gnu.org; Mon, 28 Aug 2023 06:55:00 -0400 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 08FA538A013F for <65542-done@debbugs.gnu.org>; Mon, 28 Aug 2023 10:54:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1693220093; bh=j7AWtYN80ESuRg4mmSKyY/LREIoyhGlb0bVg9y4K8P4=; h=From:To:Subject:References:Date:In-Reply-To:From; b=CRqKd7/QEoz4TctgjBH6nZPaz+lsgJvRuzV6sVDWFww2R/kceZggCHHxOkUtagLLz yqNpM+yusij3Sh96hUMwt2gVodHDf8N2qPnYh8+LOYmJftovAZk0hp7uYkJubXBuLf 6ok3DmiWmBTKjoXWgFdMJX+GxDw3dL++ZtsIRz/Cb78CjbjTYR5SpEy3WFPEkX9Rzd yaOXa0EO0Tby/ebDvopIvRrkF9DX6mpd7Jrl/Pm5hQPBImgsHzXXAVZaWSxxKZ60gR l9PezLwlRPrfhv8lDsmgmy5NpELvQkDKTUDcN/zAMcG4G5vKhh+jUGS8iBd4X9NDQF J2aBIZKkU9Y6riZO8xPvoF2OEla/2HppNnO/YzfLWkkT2SYen9fmtfRzpRXaRTetUi PykIqppw6FtDsf8jfDRDogDUPK+6W1xEsWZ/1LgDWgGGX6ZogSMOutwiCnJjycZ5hb OdBbALQhhhCvWbXaliEKzD5fJH8YjlnrKSt7DgO3FmXx9EBut2blrriH0CAZ3yZsEq odca/hKWcCrXv88d4Erw+k+PeMsizgelKKF/e6/+INP4iOdrR4SkiHLSjcuYWj1Wf+ Crnm91E7LJNmmm15XeT5PxmXH+WRrzELZzJzMRrkIbZ9leo6m6cagJT4Gl4MRARZKN +6ZAVSw11yvrbwQyHDk/qQbo= X-Virus-Scanned: Debian amavisd-new at mail.envs.net Received: from mail.envs.net ([127.0.0.1]) by localhost (mail.envs.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id m3wTbHx5JP2B for <65542-done@debbugs.gnu.org>; Mon, 28 Aug 2023 10:54:50 +0000 (UTC) Received: from localhost (unknown [36.170.44.50]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.envs.net (Postfix) with ESMTPSA for <65542-done@debbugs.gnu.org>; Mon, 28 Aug 2023 10:54:50 +0000 (UTC) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id dcc0a5c4 for <65542-done@debbugs.gnu.org>; Mon, 28 Aug 2023 10:55:14 +0000 (UTC) From: =?utf-8?B?5a6L5paH5q2m?= To: 65542-done@debbugs.gnu.org Subject: Re: [bug#65542] [PATCH] gnu: intel-xed: Update to 2023.08.21. References: <5365959605f2d6878cd124cd3938b84d26a05ddc.1693019039.git.iyzsong@member.fsf.org> Date: Mon, 28 Aug 2023 18:55:14 +0800 In-Reply-To: <5365959605f2d6878cd124cd3938b84d26a05ddc.1693019039.git.iyzsong@member.fsf.org> (iyzsong@envs.net's message of "Sat, 26 Aug 2023 11:04:04 +0800") Message-ID: <873503phbh.fsf@envs.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65542-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Pushed, closing. From unknown Tue Jun 17 01:40:19 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 25 Sep 2023 11:24:13 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator