From 451b458fc36531edf32bb66ad66fb1531d9bab55 Mon Sep 17 00:00:00 2001
From: Mark McCaskey <mark@wasmer.io>
Date: Thu, 19 Sep 2019 10:39:47 -0700
Subject: [PATCH 1/3] Add feature matrix document

---
 docs/feature_matrix.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 docs/feature_matrix.md

diff --git a/docs/feature_matrix.md b/docs/feature_matrix.md
new file mode 100644
index 00000000000..51808065b09
--- /dev/null
+++ b/docs/feature_matrix.md
@@ -0,0 +1,20 @@
+# Feature Table
+
+## Compiler Backend
+
+| &nbsp; | Singlepass | Cranelift | LLVM |
+| - | - | - | - |
+| Caching | No | Yes | Yes |
+| SIMD | No | No | Yes |
+| Multi-value return | No | No | No |
+
+
+## Language integration
+
+TODO: define a set of features that are relevant and mark them here
+
+Current ideas:
+
+- WASI FS API
+- Callbacks? (not even in Rust yet)
+- Exiting early in hostcall

From c09e0e06dfd98f57aa2267c555bf4bda3276f030 Mon Sep 17 00:00:00 2001
From: Mark McCaskey <mark@wasmer.io>
Date: Fri, 20 Sep 2019 17:01:41 -0700
Subject: [PATCH 2/3] Update feature matrix

---
 CHANGELOG.md           |  1 +
 docs/feature_matrix.md | 11 +++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1651f7ffbeb..9f800b7a2e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ Blocks of changes will separated by version increments.
 
 ## **[Unreleased]**
 
+- [#817](https://github.com/wasmerio/wasmer/pull/817) Add document for tracking features across backends and language integrations, [docs/feature_matrix.md]
 - [#790](https://github.com/wasmerio/wasmer/pull/790) Fix flaky test failure with LLVM, switch to large code model.
 - [#788](https://github.com/wasmerio/wasmer/pull/788) Use union merge on the changelog file.
 - [#785](https://github.com/wasmerio/wasmer/pull/785) Include Apache license file for spectests.
diff --git a/docs/feature_matrix.md b/docs/feature_matrix.md
index 51808065b09..abca531d6d2 100644
--- a/docs/feature_matrix.md
+++ b/docs/feature_matrix.md
@@ -4,9 +4,10 @@
 
 | &nbsp; | Singlepass | Cranelift | LLVM |
 | - | - | - | - |
-| Caching | No | Yes | Yes |
-| SIMD | No | No | Yes |
-| Multi-value return | No | No | No |
+| Caching | ❌ | ✅ | ✅ |
+| SIMD | ❌ | ❌ | ✅ |
+| Multi-value return | ❌ | ❌ | ❌ |
+| Metering | ✅ | ✅ | ❓ | 
 
 
 ## Language integration
@@ -16,5 +17,7 @@ TODO: define a set of features that are relevant and mark them here
 Current ideas:
 
 - WASI FS API
-- Callbacks? (not even in Rust yet)
+- Callbacks
 - Exiting early in hostcall
+- Metering
+- Caching

From 2ef64b0a19b2f1637a0fcd90355e6561f545daea Mon Sep 17 00:00:00 2001
From: Mark McCaskey <mark@wasmer.io>
Date: Mon, 23 Sep 2019 10:20:46 -0700
Subject: [PATCH 3/3] Update feature matrix with input from Brandon and Nick

---
 docs/feature_matrix.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/docs/feature_matrix.md b/docs/feature_matrix.md
index abca531d6d2..6931c38b4d4 100644
--- a/docs/feature_matrix.md
+++ b/docs/feature_matrix.md
@@ -5,9 +5,12 @@
 | &nbsp; | Singlepass | Cranelift | LLVM |
 | - | - | - | - |
 | Caching | ❌ | ✅ | ✅ |
-| SIMD | ❌ | ❌ | ✅ |
+| Emscripten | ✅ | ✅ | ✅ |
+| Metering | ✅ | ❌ | ✅ |
 | Multi-value return | ❌ | ❌ | ❌ |
-| Metering | ✅ | ✅ | ❓ | 
+| OSR | 🚧 | ❓ | ❓ |
+| SIMD | ❌ | ❌ | ✅ |
+| WASI | ✅ | ✅ | ✅ |
 
 
 ## Language integration