correct caching

internal/shop.cm

@@ -21,25 +21,6 @@ var my$_ = actor_api
 
 var core = "core"
 
-// Compiler fingerprint: hash of all compiler source files so that any compiler
-// change invalidates the entire build cache. Folded into hash_path().
-var compiler_fingerprint = (function() {
-  var files = [
-    "tokenize", "parse", "fold", "mcode", "streamline",
-    "qbe", "qbe_emit", "ir_stats"
-  ]
-  var combined = ""
-  var i = 0
-  var path = null
-  while (i < length(files)) {
-    path = core_path + '/' + files[i] + '.cm'
-    if (fd.is_file(path))
-      combined = combined + text(fd.slurp(path))
-    i = i + 1
-  }
-  return content_hash(stone(blob(combined)))
-})()
-
 // Make a package name safe for use in C identifiers.
 // Replaces /, ., -, @ with _ so the result is a valid C identifier fragment.
 function safe_c_name(name) {
@@ -48,21 +29,18 @@ function safe_c_name(name) {
 
 function pull_from_cache(content)
 {
-  var path = hash_path(content)
-  if (fd.is_file(path))
+  var path = cache_path(content)
+  if (fd.is_file(path)) {
+    log.system('shop: cache hit')
     return fd.slurp(path)
+  }
 }
 
 function put_into_cache(content, obj)
 {
-  var path = hash_path(content)
+  var path = cache_path(content)
   fd.slurpwrite(path, obj)
-}
-
-function hash_path(content, salt)
-{
-  var s = salt || 'mach'
-  return global_shop_path + '/build/' + content_hash(stone(blob(text(content) + '\n' + s + '\n' + compiler_fingerprint)))
+  log.system('shop: cached')
 }
 
 var Shop = {}
@@ -818,7 +796,7 @@ function resolve_mod_fn(path, pkg) {
 
   // Check for cached mcode in content-addressed store
   if (policy.allow_compile) {
-    cached_mcode_path = hash_path(content_key, 'mcode')
+    cached_mcode_path = cache_path(content_key, 'mcode')
     if (fd.is_file(cached_mcode_path)) {
       mcode_json = text(fd.slurp(cached_mcode_path))
       compiled = mach_compile_mcode_bin(path, mcode_json)
@@ -877,7 +855,7 @@ function resolve_mod_fn_bytecode(path, pkg) {
   if (cached) return cached
 
   // Check for cached mcode
-  cached_mcode_path = hash_path(content_key, 'mcode')
+  cached_mcode_path = cache_path(content_key, 'mcode')
   if (fd.is_file(cached_mcode_path)) {
     mcode_json = text(fd.slurp(cached_mcode_path))
     compiled = mach_compile_mcode_bin(path, mcode_json)
@@ -896,7 +874,7 @@ function resolve_mod_fn_bytecode(path, pkg) {
   mcode_json = shop_json.encode(optimized)
 
   fd.ensure_dir(global_shop_path + '/build')
-  fd.slurpwrite(hash_path(content_key, 'mcode'), stone(blob(mcode_json)))
+  fd.slurpwrite(cache_path(content_key, 'mcode'), stone(blob(mcode_json)))
 
   compiled = mach_compile_mcode_bin(path, mcode_json)
   put_into_cache(content_key, compiled)
@@ -2170,6 +2148,7 @@ Shop.get_lib_dir = function() {
 Shop.ensure_dir = fd.ensure_dir
 Shop.install_zip = install_zip
 Shop.ensure_package_dylibs = ensure_package_dylibs
+Shop.resolve_path = resolve_path
 
 Shop.get_local_dir = function() {
   return global_shop_path + "/local"
@@ -2236,7 +2215,7 @@ Shop.load_as_mach = function(path, pkg) {
 
   // Try cached mcode -> compile to mach
   if (!compiled) {
-    cached_mcode_path = hash_path(content_key, 'mcode')
+    cached_mcode_path = cache_path(content_key, 'mcode')
     if (fd.is_file(cached_mcode_path)) {
       mcode_json = text(fd.slurp(cached_mcode_path))
       compiled = mach_compile_mcode_bin(file_path, mcode_json)
@@ -2256,7 +2235,7 @@ Shop.load_as_mach = function(path, pkg) {
     ir = _mcode_mod(ast)
     optimized = _streamline_mod(ir)
     mcode_json = shop_json.encode(optimized)
-    cached_mcode_path = hash_path(content_key, 'mcode')
+    cached_mcode_path = cache_path(content_key, 'mcode')
     fd.ensure_dir(global_shop_path + '/build')
     fd.slurpwrite(cached_mcode_path, stone(blob(mcode_json)))
     compiled = mach_compile_mcode_bin(file_path, mcode_json)
@@ -2309,6 +2288,34 @@ Shop.load_as_dylib = function(path, pkg) {
   return os.native_module_load_named(result._handle, result._sym, env)
 }
 
+// Check if a .cm file has a cached bytecode artifact (mach or mcode)
+Shop.is_cached = function(path) {
+  if (!fd.is_file(path)) return false
+  var content_key = stone(blob(text(fd.slurp(path))))
+  if (fd.is_file(cache_path(content_key, 'mach'))) return true
+  if (fd.is_file(cache_path(content_key, 'mcode'))) return true
+  return false
+}
+
+// Check if a .cm file has a cached native dylib artifact
+Shop.is_native_cached = function(path, pkg) {
+  var build_mod = use_cache['core/build']
+  if (!build_mod || !fd.is_file(path)) return false
+  var src = text(fd.slurp(path))
+  var host = detect_host_target()
+  if (!host) return false
+  var san_flags = build_mod.native_sanitize_flags ? build_mod.native_sanitize_flags() : ''
+  var native_key = build_mod.native_cache_content ?
+    build_mod.native_cache_content(src, host, san_flags) :
+    (src + '\n' + host)
+  return fd.is_file(build_mod.cache_path(native_key, build_mod.SALT_NATIVE))
+}
+
+// Compile + cache a module without executing it
+Shop.precompile = function(path, pkg) {
+  resolve_mod_fn(path, pkg)
+}
+
 Shop.audit_packages = function() {
   var packages = Shop.list_packages()