From a41da3eb0e852bc71cf5e468f0b399da69fe0647 Mon Sep 17 00:00:00 2001 From: Jacob Lifshay Date: Fri, 30 Apr 2021 19:43:59 -0700 Subject: [PATCH 1/1] working on code --- .gitignore | 2 + Cargo.toml | 8 + LICENSE-APACHE | 176 +++++++++++++++ LICENSE-MIT | 23 ++ src/lib.rs | 7 + src/traits.rs | 565 +++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 781 insertions(+) create mode 100644 .gitignore create mode 100644 Cargo.toml create mode 100644 LICENSE-APACHE create mode 100644 LICENSE-MIT create mode 100644 src/lib.rs create mode 100644 src/traits.rs diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..96ef6c0 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/target +Cargo.lock diff --git a/Cargo.toml b/Cargo.toml new file mode 100644 index 0000000..833a289 --- /dev/null +++ b/Cargo.toml @@ -0,0 +1,8 @@ +[package] +name = "vector-math" +version = "0.1.0" +authors = ["Jacob Lifshay "] +edition = "2018" +license = "MIT OR Apache-2.0" + +[dependencies] diff --git a/LICENSE-APACHE b/LICENSE-APACHE new file mode 100644 index 0000000..1b5ec8b --- /dev/null +++ b/LICENSE-APACHE @@ -0,0 +1,176 @@ + 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 diff --git a/LICENSE-MIT b/LICENSE-MIT new file mode 100644 index 0000000..31aa793 --- /dev/null +++ b/LICENSE-MIT @@ -0,0 +1,23 @@ +Permission is hereby granted, free of charge, to any +person obtaining a copy of this software and associated +documentation files (the "Software"), to deal in the +Software without restriction, including without +limitation the rights to use, copy, modify, merge, +publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software +is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice +shall be included in all copies or substantial portions +of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF +ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED +TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A +PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT +SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR +IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. diff --git a/src/lib.rs b/src/lib.rs new file mode 100644 index 0000000..088d074 --- /dev/null +++ b/src/lib.rs @@ -0,0 +1,7 @@ +#![no_std] + +pub mod traits; + +#[derive(Clone, Copy, Debug, Default, Hash)] +#[repr(transparent)] +pub struct F16(pub u16); diff --git a/src/traits.rs b/src/traits.rs new file mode 100644 index 0000000..d5c7b77 --- /dev/null +++ b/src/traits.rs @@ -0,0 +1,565 @@ +use core::ops::{ + Add, AddAssign, BitAnd, BitAndAssign, BitOr, BitOrAssign, BitXor, BitXorAssign, Div, DivAssign, + Mul, MulAssign, Neg, Not, Rem, RemAssign, Shl, ShlAssign, Shr, ShrAssign, Sub, SubAssign, +}; + +use crate::F16; + +#[rustfmt::skip] // work around for https://github.com/rust-lang/rustfmt/issues/4823 +macro_rules! make_types { + ( + #[bool] + $(#[scalar = $ScalarBool:ident])? + type $Bool:ident; + + #[u8] + $(#[scalar = $ScalarU8:ident])? + type $U8:ident; + + #[u16] + $(#[scalar = $ScalarU16:ident])? + type $U16:ident; + + #[u32] + $(#[scalar = $ScalarU32:ident])? + type $U32:ident; + + #[u64] + $(#[scalar = $ScalarU64:ident])? + type $U64:ident; + + #[i8] + $(#[scalar = $ScalarI8:ident])? + type $I8:ident; + + #[i16] + $(#[scalar = $ScalarI16:ident])? + type $I16:ident; + + #[i32] + $(#[scalar = $ScalarI32:ident])? + type $I32:ident; + + #[i64] + $(#[scalar = $ScalarI64:ident])? + type $I64:ident; + + #[f16] + $(#[scalar = $ScalarF16:ident])? + type $F16:ident; + + #[f32] + $(#[scalar = $ScalarF32:ident])? + type $F32:ident; + + #[f64] + $(#[scalar = $ScalarF64:ident])? + type $F64:ident; + ) => { + type Bool: Bool + Make + Select; + type U8: UInt + + Compare + + Make + + ConvertTo + + Into + + Into + + Into + + Into + + Into + + Into + + Into + + Into + + Into; + type U16: UInt + + Compare + + Make + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + Into + + Into + + Into + + Into + + Into + + Into; + type U32: UInt + + Compare + + Make + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + Into + + Into + + Into; + type U64: UInt + + Compare + + Make + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo; + type I8: SInt + + Compare + + Make + + ConvertTo + + ConvertTo + + Into + + Into + + ConvertTo + + Into + + Into + + ConvertTo + + Into + + Into; + type I16: SInt + + Compare + + Make + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + Into + + Into + + ConvertTo + + Into + + Into; + type I32: SInt + + Compare + + Make + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + Into + + Into; + type I64: SInt + + Compare + + Make + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo; + type F16: Float + + Compare + + Make + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + Into + + ConvertTo + + ConvertTo + + Into; + type F32: Float + + Compare + + Make + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + Into; + type F64: Float + + Compare + + Make + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo; + }; +} + +/// reference used to build IR for Kazan; an empty type for `core::simd` +pub trait Context: Copy { + make_types! { + #[bool] + type Bool; + + #[u8] + type U8; + + #[u16] + type U16; + + #[u32] + type U32; + + #[u64] + type U64; + + #[i8] + type I8; + + #[i16] + type I16; + + #[i32] + type I32; + + #[i64] + type I64; + + #[f16] + type F16; + + #[f32] + type F32; + + #[f64] + type F64; + } + make_types! { + #[bool] + #[scalar = ScalarBool] + type Bool; + + #[u8] + #[scalar = ScalarU8] + type U8; + + #[u16] + #[scalar = ScalarU16] + type U16; + + #[u32] + #[scalar = ScalarU32] + type U32; + + #[u64] + #[scalar = ScalarU64] + type U64; + + #[i8] + #[scalar = ScalarI8] + type I8; + + #[i16] + #[scalar = ScalarI16] + type I16; + + #[i32] + #[scalar = ScalarI32] + type I32; + + #[i64] + #[scalar = ScalarI64] + type I64; + + #[f16] + #[scalar = ScalarF16] + type F16; + + #[f32] + #[scalar = ScalarF32] + type F32; + + #[f64] + #[scalar = ScalarF64] + type F64; + } + type Bool: Bool + Make + Select; + type U8: UInt + + Compare + + Make + + ConvertTo + + Into + + Into + + Into + + Into + + Into + + Into + + Into + + Into + + Into; + type U16: UInt + + Compare + + Make + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + Into + + Into + + Into + + Into + + Into + + Into; + type U32: UInt + + Compare + + Make + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + Into + + Into + + Into; + type U64: UInt + + Compare + + Make + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo; + type I8: SInt + + Compare + + Make + + ConvertTo + + ConvertTo + + Into + + Into + + ConvertTo + + Into + + Into + + ConvertTo + + Into + + Into; + type I16: SInt + + Compare + + Make + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + Into + + Into + + ConvertTo + + Into + + Into; + type I32: SInt + + Compare + + Make + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + Into + + Into; + type I64: SInt + + Compare + + Make + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo; + type F16: Float + + Compare + + Make + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + Into + + ConvertTo + + ConvertTo + + Into; + type F32: Float + + Compare + + Make + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + Into; + type F64: Float + + Compare + + Make + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo + + ConvertTo; + // Vector types + type VecBool: From + Bool + Make + Select; + type VecU8: From + + UInt + + Compare + + Make; + type VecI8: From + + SInt + + Compare + + Make; + type VecU16: From + + UInt + + Compare + + Make; + type VecI16: From + + SInt + + Compare + + Make; + type VecF16: From + Float + Compare + Make; + type VecU32: From + + UInt + + Compare + + Make; + type VecI32: From + + SInt + + Compare + + Make; + type VecF32: From + Float + Compare + Make; + type VecU64: From + + UInt + + Compare + + Make; + type VecI64: From + + SInt + + Compare + + Make; + type VecF64: From + Float + Compare + Make; + fn make>(self, v: T::Prim) -> T { + T::make(self, v) + } +} + +pub trait Make: Sized { + type Prim; + fn make(ctx: Context, v: Self::Prim) -> Self; +} + +pub trait ConvertTo { + fn to(self) -> T; +} + +impl> ConvertTo for U { + fn to(self) -> T { + self.into() + } +} + +pub trait Number: + Compare + + Add + + Sub + + Mul + + Div + + Rem + + AddAssign + + SubAssign + + MulAssign + + DivAssign + + RemAssign +{ +} + +pub trait BitOps: + Copy + + BitAnd + + BitOr + + BitXor + + Not + + BitAndAssign + + BitOrAssign + + BitXorAssign +{ +} + +pub trait Int: + Number + + BitOps + + Shl + + Shr + + ShlAssign + + ShrAssign +{ +} + +pub trait UInt: Int {} + +pub trait SInt: Int + Neg {} + +pub trait Float: Number + Neg { + type BitsType: UInt; + fn abs(self) -> Self; + fn trunc(self) -> Self; + fn ceil(self) -> Self; + fn floor(self) -> Self; + fn round(self) -> Self; + fn fma(self, a: Self, b: Self) -> Self; + fn is_nan(self) -> Self::Bool; + fn is_infinity(self) -> Self::Bool; + fn is_finite(self) -> Self::Bool; + fn from_bits(v: Self::BitsType) -> Self; + fn to_bits(self) -> Self::BitsType; +} + +pub trait Bool: BitOps {} + +pub trait Select: Bool { + fn select(self, true_v: T, false_v: T) -> T; +} + +pub trait Compare: Copy { + type Bool: Bool + Select; + fn eq(self, rhs: Self) -> Self::Bool; + fn ne(self, rhs: Self) -> Self::Bool; + fn lt(self, rhs: Self) -> Self::Bool; + fn gt(self, rhs: Self) -> Self::Bool; + fn le(self, rhs: Self) -> Self::Bool; + fn ge(self, rhs: Self) -> Self::Bool; +} -- 2.30.2