diff --git a/Cargo.lock b/Cargo.lock index 47c83d2aa9a7..ec159c95d68b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -676,7 +676,6 @@ dependencies = [ "capstone", "cranelift-bforest", "cranelift-codegen-meta", - "cranelift-codegen-shared", "cranelift-control", "cranelift-entity", "cranelift-isle", @@ -696,13 +695,6 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" version = "0.99.0" -dependencies = [ - "cranelift-codegen-shared", -] - -[[package]] -name = "cranelift-codegen-shared" -version = "0.99.0" [[package]] name = "cranelift-control" diff --git a/cranelift/codegen/Cargo.toml b/cranelift/codegen/Cargo.toml index a0a78ba867c4..106831cab2fe 100644 --- a/cranelift/codegen/Cargo.toml +++ b/cranelift/codegen/Cargo.toml @@ -16,7 +16,6 @@ edition.workspace = true anyhow = { workspace = true, optional = true } bumpalo = "3" capstone = { workspace = true, optional = true } -cranelift-codegen-shared = { path = "./shared", version = "0.99.0" } cranelift-entity = { workspace = true } cranelift-bforest = { workspace = true } cranelift-control = { workspace = true } diff --git a/cranelift/codegen/meta/Cargo.toml b/cranelift/codegen/meta/Cargo.toml index 75303fa4d211..480a26b182de 100644 --- a/cranelift/codegen/meta/Cargo.toml +++ b/cranelift/codegen/meta/Cargo.toml @@ -12,4 +12,3 @@ edition.workspace = true rustdoc-args = [ "--document-private-items" ] [dependencies] -cranelift-codegen-shared = { path = "../shared", version = "0.99.0" } diff --git a/cranelift/codegen/meta/src/cdsl/types.rs b/cranelift/codegen/meta/src/cdsl/types.rs index 3eb32ebee67a..a5fdfaaa39d3 100644 --- a/cranelift/codegen/meta/src/cdsl/types.rs +++ b/cranelift/codegen/meta/src/cdsl/types.rs @@ -3,7 +3,34 @@ use std::fmt; use crate::shared::types as shared_types; -use cranelift_codegen_shared::constants; + +pub mod constants { + // Numbering scheme for value types: + // + // 0: Void + // 0x01-0x6f: Special types + // 0x70-0x7d: Lane types + // 0x7e-0x7f: Reference types + // 0x80-0xff: Vector types + // 0x100-0x17f: Dynamic Vector types + // + // Vector types are encoded with the lane type in the low 4 bits and log2(lanes) + // in the next highest 4 bits, giving a range of 2-256 lanes. + + // Dynamic vector types are encoded similarily. + + /// Start of the lane types. + pub const LANE_BASE: u16 = 0x70; + + /// Base for reference types. + pub const REFERENCE_BASE: u16 = 0x7E; + + /// Start of the 2-lane vector types. + pub const VECTOR_BASE: u16 = 0x80; + + /// Start of the dynamic vector types. + pub const DYNAMIC_VECTOR_BASE: u16 = 0x100; +} // Rust name prefix used for the `rust_name` method. static RUST_NAME_PREFIX: &str = "ir::types::"; diff --git a/cranelift/codegen/meta/src/constant_hash.rs b/cranelift/codegen/meta/src/constant_hash.rs index a81b0db6f411..e992a71333b5 100644 --- a/cranelift/codegen/meta/src/constant_hash.rs +++ b/cranelift/codegen/meta/src/constant_hash.rs @@ -9,6 +9,27 @@ use std::iter; +/// A primitive hash function for matching opcodes. +pub fn simple_hash(s: &str) -> usize { + let mut h: u32 = 5381; + for c in s.chars() { + h = (h ^ c as u32).wrapping_add(h.rotate_right(6)); + } + h as usize +} + +// Note: Keep in sync with the above code. +pub static SIMPLE_HASH_SOURCE: &str = r#" +/// A primitive hash function for matching opcodes. +pub fn simple_hash(s: &str) -> usize { + let mut h: u32 = 5381; + for c in s.chars() { + h = (h ^ c as u32).wrapping_add(h.rotate_right(6)); + } + h as usize +} +"#; + /// Compute an open addressed, quadratically probed hash table containing /// `items`. The returned table is a list containing the elements of the /// iterable `items` and `None` in unused slots. @@ -44,8 +65,7 @@ pub fn generate_table<'cont, T, I: iter::Iterator, H: Fn(&T) -> #[cfg(test)] mod tests { - use super::generate_table; - use cranelift_codegen_shared::constant_hash::simple_hash; + use super::{generate_table, simple_hash}; #[test] fn test_generate_table() { @@ -61,4 +81,10 @@ mod tests { ] ); } + + #[test] + fn basic() { + assert_eq!(simple_hash("Hello"), 0x2fa70c01); + assert_eq!(simple_hash("world"), 0x5b0c31d5); + } } diff --git a/cranelift/codegen/meta/src/gen_inst.rs b/cranelift/codegen/meta/src/gen_inst.rs index 329bff65fc6f..ef199bb7a902 100644 --- a/cranelift/codegen/meta/src/gen_inst.rs +++ b/cranelift/codegen/meta/src/gen_inst.rs @@ -2,14 +2,13 @@ use std::fmt; use std::rc::Rc; -use cranelift_codegen_shared::constant_hash; - use crate::cdsl::camel_case; use crate::cdsl::formats::InstructionFormat; use crate::cdsl::instructions::{AllInstructions, Instruction}; use crate::cdsl::operands::Operand; use crate::cdsl::typevar::{TypeSet, TypeVar}; +use crate::constant_hash::{generate_table, simple_hash}; use crate::error; use crate::srcgen::{Formatter, Match}; use crate::unique_table::{UniqueSeqTable, UniqueTable}; @@ -658,10 +657,9 @@ fn gen_opcodes(all_inst: &AllInstructions, fmt: &mut Formatter) { fmt.empty_line(); // Generate an opcode hash table for looking up opcodes by name. - let hash_table = - crate::constant_hash::generate_table(all_inst.iter(), all_inst.len(), |inst| { - constant_hash::simple_hash(&inst.name) - }); + let hash_table = generate_table(all_inst.iter(), all_inst.len(), |inst| { + simple_hash(&inst.name) + }); fmtln!( fmt, "const OPCODE_HASH_TABLE: [Option; {}] = [", diff --git a/cranelift/codegen/meta/src/gen_settings.rs b/cranelift/codegen/meta/src/gen_settings.rs index 097581bef6d8..2162132635c8 100644 --- a/cranelift/codegen/meta/src/gen_settings.rs +++ b/cranelift/codegen/meta/src/gen_settings.rs @@ -1,8 +1,7 @@ //! Generate the ISA-specific settings. use std::collections::HashMap; -use crate::constant_hash::generate_table; -use cranelift_codegen_shared::constant_hash::simple_hash; +use crate::constant_hash::{generate_table, simple_hash}; use crate::cdsl::camel_case; use crate::cdsl::settings::{ diff --git a/cranelift/codegen/meta/src/gen_types.rs b/cranelift/codegen/meta/src/gen_types.rs index 7c7cacda31b0..5615721dc5c4 100644 --- a/cranelift/codegen/meta/src/gen_types.rs +++ b/cranelift/codegen/meta/src/gen_types.rs @@ -7,7 +7,7 @@ //! This ensures that the metaprogram and the generated program see the same //! type numbering. -use crate::cdsl::types as cdsl_types; +use crate::cdsl::types::{self as cdsl_types, constants}; use crate::error; use crate::srcgen; @@ -48,6 +48,32 @@ fn emit_dynamic_vectors(bits: u64, fmt: &mut srcgen::Formatter) { /// Emit types using the given formatter object. fn emit_types(fmt: &mut srcgen::Formatter) { + fmt.line("#[allow(dead_code)]"); + fmt.line("mod constants {"); + fmt.indent(|fmt| { + fmtln!( + fmt, + "pub const LANE_BASE: u16 = {:#X};\n", + constants::LANE_BASE + ); + fmtln!( + fmt, + "pub const REFERENCE_BASE: u16 = {:#X};\n", + constants::REFERENCE_BASE + ); + fmtln!( + fmt, + "pub const VECTOR_BASE: u16 = {:#X};\n", + constants::VECTOR_BASE + ); + fmtln!( + fmt, + "pub const DYNAMIC_VECTOR_BASE: u16 = {:#X};\n", + constants::DYNAMIC_VECTOR_BASE + ); + }); + fmt.line("}"); + // Emit all of the lane types, such integers, floats, and booleans. for ty in cdsl_types::ValueType::all_lane_types().map(cdsl_types::ValueType::from) { emit_type(&ty, fmt); diff --git a/cranelift/codegen/meta/src/lib.rs b/cranelift/codegen/meta/src/lib.rs index 689d3508b06c..125fb04eaafa 100644 --- a/cranelift/codegen/meta/src/lib.rs +++ b/cranelift/codegen/meta/src/lib.rs @@ -45,6 +45,10 @@ pub fn generate(isas: &[isa::Isa], out_dir: &str, isle_dir: &str) -> Result<(), isle_dir, )?; + let mut fmt = srcgen::Formatter::new(); + fmt.line(crate::constant_hash::SIMPLE_HASH_SOURCE); + fmt.update_file("constant_hash.rs", out_dir)?; + // Per ISA definitions. for isa in isa::define(isas) { gen_settings::generate( diff --git a/cranelift/codegen/shared/Cargo.toml b/cranelift/codegen/shared/Cargo.toml deleted file mode 100644 index 6137d0d2f357..000000000000 --- a/cranelift/codegen/shared/Cargo.toml +++ /dev/null @@ -1,13 +0,0 @@ -[package] -authors = ["The Cranelift Project Developers"] -name = "cranelift-codegen-shared" -version = "0.99.0" -description = "For code shared between cranelift-codegen-meta and cranelift-codegen" -license = "Apache-2.0 WITH LLVM-exception" -repository = "https://github.com/bytecodealliance/wasmtime" -readme = "README.md" -edition.workspace = true - -[dependencies] -# Since this is a shared dependency of several packages, please strive to keep this dependency-free -# when no features are enabled. diff --git a/cranelift/codegen/shared/LICENSE b/cranelift/codegen/shared/LICENSE deleted file mode 100644 index f9d81955f4bc..000000000000 --- a/cranelift/codegen/shared/LICENSE +++ /dev/null @@ -1,220 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - ---- LLVM Exceptions to the Apache 2.0 License ---- - -As an exception, if, as a result of your compiling your source code, portions -of this Software are embedded into an Object form of such source code, you -may redistribute such embedded portions in such Object form without complying -with the conditions of Sections 4(a), 4(b) and 4(d) of the License. - -In addition, if you combine or link compiled forms of this Software with -software that is licensed under the GPLv2 ("Combined Software") and if a -court of competent jurisdiction determines that the patent provision (Section -3), the indemnity provision (Section 9) or other Section of the License -conflicts with the conditions of the GPLv2, you may retroactively and -prospectively choose to deem waived or otherwise exclude such Section(s) of -the License, but only in their entirety and only with respect to the Combined -Software. - diff --git a/cranelift/codegen/shared/README.md b/cranelift/codegen/shared/README.md deleted file mode 100644 index 54f9f5d6d29d..000000000000 --- a/cranelift/codegen/shared/README.md +++ /dev/null @@ -1,2 +0,0 @@ -This crate contains shared definitions for use in both `cranelift-codegen-meta` and `cranelift --codegen`. diff --git a/cranelift/codegen/shared/src/constant_hash.rs b/cranelift/codegen/shared/src/constant_hash.rs deleted file mode 100644 index 2929319656ba..000000000000 --- a/cranelift/codegen/shared/src/constant_hash.rs +++ /dev/null @@ -1,21 +0,0 @@ -//! This module provides a primitive hash function. - -/// A primitive hash function for matching opcodes. -pub fn simple_hash(s: &str) -> usize { - let mut h: u32 = 5381; - for c in s.chars() { - h = (h ^ c as u32).wrapping_add(h.rotate_right(6)); - } - h as usize -} - -#[cfg(test)] -mod tests { - use super::simple_hash; - - #[test] - fn basic() { - assert_eq!(simple_hash("Hello"), 0x2fa70c01); - assert_eq!(simple_hash("world"), 0x5b0c31d5); - } -} diff --git a/cranelift/codegen/shared/src/constants.rs b/cranelift/codegen/shared/src/constants.rs deleted file mode 100644 index d9aa3916ca7f..000000000000 --- a/cranelift/codegen/shared/src/constants.rs +++ /dev/null @@ -1,28 +0,0 @@ -//! This module contains constants that are shared between the codegen and the meta crate, so they -//! are kept in sync. - -// Numbering scheme for value types: -// -// 0: Void -// 0x01-0x6f: Special types -// 0x70-0x7d: Lane types -// 0x7e-0x7f: Reference types -// 0x80-0xff: Vector types -// 0x100-0x17f: Dynamic Vector types -// -// Vector types are encoded with the lane type in the low 4 bits and log2(lanes) -// in the next highest 4 bits, giving a range of 2-256 lanes. - -// Dynamic vector types are encoded similarily. - -/// Start of the lane types. -pub const LANE_BASE: u16 = 0x70; - -/// Base for reference types. -pub const REFERENCE_BASE: u16 = 0x7E; - -/// Start of the 2-lane vector types. -pub const VECTOR_BASE: u16 = 0x80; - -/// Start of the dynamic vector types. -pub const DYNAMIC_VECTOR_BASE: u16 = 0x100; diff --git a/cranelift/codegen/shared/src/lib.rs b/cranelift/codegen/shared/src/lib.rs deleted file mode 100644 index 5af30f869827..000000000000 --- a/cranelift/codegen/shared/src/lib.rs +++ /dev/null @@ -1,26 +0,0 @@ -//! This library contains code that is common to both the `cranelift-codegen` and -//! `cranelift-codegen-meta` libraries. - -#![deny(missing_docs, trivial_numeric_casts, unused_extern_crates)] -#![warn(unused_import_braces)] -#![cfg_attr(feature = "std", deny(unstable_features))] -#![cfg_attr(feature = "clippy", plugin(clippy(conf_file = "../../clippy.toml")))] -#![cfg_attr(feature = "cargo-clippy", allow(clippy::new_without_default))] -#![cfg_attr( - feature = "cargo-clippy", - warn( - clippy::float_arithmetic, - clippy::mut_mut, - clippy::nonminimal_bool, - clippy::map_unwrap_or, - clippy::print_stdout, - clippy::unicode_not_nfc, - clippy::use_self - ) -)] - -pub mod constant_hash; -pub mod constants; - -/// Version number of this crate. -pub const VERSION: &str = env!("CARGO_PKG_VERSION"); diff --git a/cranelift/codegen/src/constant_hash.rs b/cranelift/codegen/src/constant_hash.rs index 1de2a2edb43e..476c93b70662 100644 --- a/cranelift/codegen/src/constant_hash.rs +++ b/cranelift/codegen/src/constant_hash.rs @@ -10,8 +10,7 @@ //! //! This module provides runtime support for lookups in these tables. -// Re-export entities from constant_hash for simplicity of use. -pub use cranelift_codegen_shared::constant_hash::*; +include!(concat!(env!("OUT_DIR"), "/constant_hash.rs")); /// Trait that must be implemented by the entries in a constant hash table. pub trait Table { diff --git a/cranelift/codegen/src/ir/types.rs b/cranelift/codegen/src/ir/types.rs index 5fa6403b522a..9c65529c0f30 100644 --- a/cranelift/codegen/src/ir/types.rs +++ b/cranelift/codegen/src/ir/types.rs @@ -2,7 +2,6 @@ use core::default::Default; use core::fmt::{self, Debug, Display, Formatter}; -use cranelift_codegen_shared::constants; #[cfg(feature = "enable-serde")] use serde::{Deserialize, Serialize}; use target_lexicon::{PointerWidth, Triple};