Recompute of constant global variables

wsmoses · wsmoses · commit 777c96e06dd4 · 2021-05-16T20:06:06.000-04:00
diff --git a/enzyme/Enzyme/ActivityAnalysis.cpp b/enzyme/Enzyme/ActivityAnalysis.cpp
@@ -1206,7 +1206,7 @@ bool ActivityAnalyzer::isConstantValue(TypeResults &TR, Value *Val) {
                    << " potentiallyActiveLoad=" << potentiallyActiveLoad
                    << " potentialStore=" << potentialStore << "\n";
     if (potentiallyActiveLoad && potentialStore) {
-      activeLoadAndStore:;
+    activeLoadAndStore:;
       insertAllFrom(TR, *Hypothesis, Val);
       // TODO have insertall dependence on this
       if (TmpOrig != Val)
diff --git a/enzyme/Enzyme/EnzymeLogic.cpp b/enzyme/Enzyme/EnzymeLogic.cpp
@@ -191,10 +191,10 @@ struct CacheAnalysis {
         }
       } else if (isa<AllocaInst>(obj)) {
         // No change to modref if alloca
-      } else if (isa<GlobalVariable>(obj)) {
+      } else if (auto GV = dyn_cast<GlobalVariable>(obj)) {
         // In the absense of more fine-grained global info, assume object is
         // written to in a subseqent call unless this is "topLevel";
-        if (!topLevel) {
+        if (!topLevel && !GV->isConstant()) {
           mustcache = true;
         }
       } else if (auto sli = dyn_cast<LoadInst>(obj)) {

Original file line number	Diff line number	Diff line change
`@@ -191,10 +191,10 @@ struct CacheAnalysis {`
`191`	`191`	`}`
`192`	`192`	`} else if (isa<AllocaInst>(obj)) {`
`193`	`193`	`// No change to modref if alloca`
`194`		`- } else if (isa<GlobalVariable>(obj)) {`
	`194`	`+ } else if (auto GV = dyn_cast<GlobalVariable>(obj)) {`
`195`	`195`	`// In the absense of more fine-grained global info, assume object is`
`196`	`196`	`// written to in a subseqent call unless this is "topLevel";`
`197`		`- if (!topLevel) {`
	`197`	`+ if (!topLevel && !GV->isConstant()) {`
`198`	`198`	`mustcache = true;`
`199`	`199`	`}`
`200`	`200`	`} else if (auto sli = dyn_cast<LoadInst>(obj)) {`