Fwd: Rename Duplicated -> Dual

Author: ZuseZ4

compiler/rustc_ast/src/expand/autodiff_attrs.rs

@@ -1,13 +1,11 @@
-use rustc_data_structures::stable_hasher::{HashStable, StableHasher};//, StableOrd};
-use crate::HashStableContext;
 use crate::expand::typetree::TypeTree;
 use thin_vec::ThinVec;
 use std::str::FromStr;
 
 use crate::NestedMetaItem;
 
 #[allow(dead_code)]
-#[derive(Clone, Copy, Eq, PartialEq, Encodable, Decodable, Debug)]
+#[derive(Clone, Copy, Eq, PartialEq, Encodable, Decodable, Debug, HashStable_Generic)]
 pub enum DiffMode {
     Inactive,
     Source,
@@ -16,44 +14,16 @@ pub enum DiffMode {
 }
 
 #[allow(dead_code)]
-#[derive(Clone, Copy, Eq, PartialEq, Encodable, Decodable, Debug)]
+#[derive(Clone, Copy, Eq, PartialEq, Encodable, Decodable, Debug, HashStable_Generic)]
 pub enum DiffActivity {
     None,
     Active,
     Const,
+    Dual,
+    DualNoNeed,
     Duplicated,
     DuplicatedNoNeed,
 }
-fn clause_diffactivity_discriminant(value: &DiffActivity) -> usize {
-    match value {
-        DiffActivity::None => 0,
-        DiffActivity::Active => 1,
-        DiffActivity::Const => 2,
-        DiffActivity::Duplicated => 3,
-        DiffActivity::DuplicatedNoNeed => 4,
-    }
-}
-fn clause_diffmode_discriminant(value: &DiffMode) -> usize {
-    match value {
-        DiffMode::Inactive => 0,
-        DiffMode::Source => 1,
-        DiffMode::Forward => 2,
-        DiffMode::Reverse => 3,
-    }
-}
-
-
-impl<CTX: HashStableContext> HashStable<CTX> for DiffMode {
-    fn hash_stable(&self, hcx: &mut CTX, hasher: &mut StableHasher) {
-        clause_diffmode_discriminant(self).hash_stable(hcx, hasher);
-    }
-}
-
-impl<CTX: HashStableContext> HashStable<CTX> for DiffActivity {
-    fn hash_stable(&self, hcx: &mut CTX, hasher: &mut StableHasher) {
-        clause_diffactivity_discriminant(self).hash_stable(hcx, hasher);
-    }
-}
 
 impl FromStr for DiffMode {
     type Err = ();
@@ -74,6 +44,8 @@ impl FromStr for DiffActivity {
             "None" => Ok(DiffActivity::None),
             "Active" => Ok(DiffActivity::Active),
             "Const" => Ok(DiffActivity::Const),
+            "Dual" => Ok(DiffActivity::Dual),
+            "DualNoNeed" => Ok(DiffActivity::DualNoNeed),
             "Duplicated" => Ok(DiffActivity::Duplicated),
             "DuplicatedNoNeed" => Ok(DiffActivity::DuplicatedNoNeed),
             _ => Err(()),

compiler/rustc_builtin_macros/src/autodiff.rs

@@ -240,7 +240,7 @@ fn gen_enzyme_decl(_ecx: &ExtCtxt<'_>, sig: &ast::FnSig, x: &AutoDiffAttrs, span
         //dbg!(&arg);
         d_inputs.push(arg.clone());
         match activity {
-            DiffActivity::Duplicated => {
+            DiffActivity::Duplicated | DiffActivity::Dual => {
                 let mut shadow_arg = arg.clone();
                 shadow_arg.ty = P(assure_mut_ref(&arg.ty));
                 // adjust name depending on mode

compiler/rustc_codegen_llvm/src/llvm/ffi.rs

@@ -2689,6 +2689,8 @@ fn cdiffe_from(act: DiffActivity) -> CDIFFE_TYPE {
         DiffActivity::None => CDIFFE_TYPE::DFT_CONSTANT,
         DiffActivity::Active => CDIFFE_TYPE::DFT_OUT_DIFF,
         DiffActivity::Const => CDIFFE_TYPE::DFT_CONSTANT,
+        DiffActivity::Dual => CDIFFE_TYPE::DFT_DUP_ARG,
+        DiffActivity::DualNoNeed => CDIFFE_TYPE::DFT_DUP_NONEED,
         DiffActivity::Duplicated => CDIFFE_TYPE::DFT_DUP_ARG,
         DiffActivity::DuplicatedNoNeed => CDIFFE_TYPE::DFT_DUP_NONEED,
     };