diff --git a/data/cpu/amd/2017/hedt/amd-1d3101a8ugaf3.json b/data/cpu/amd/2017/hedt/amd-1d3101a8ugaf3.json
new file mode 100644
index 0000000..7de6657
--- /dev/null
+++ b/data/cpu/amd/2017/hedt/amd-1d3101a8ugaf3.json
@@ -0,0 +1,39 @@
+{
+  "slug": "amd-1d3101a8ugaf3",
+  "name": "AMD Eng Sample 1D3101A8UGAF3",
+  "manufacturer": "amd",
+  "sample_class": "es",
+  "qspec": null,
+  "opn": "1D3101A8UGAF3",
+  "stepping": null,
+  "cpuid": null,
+  "sample_revision": "es1",
+  "retail_equivalent": null,
+  "first_seen_date": null,
+  "release_date": null,
+  "segment": "hedt",
+  "architecture": "Zen",
+  "socket": "TR4",
+  "process_node": "14 nm",
+  "cores": 16,
+  "threads": 32,
+  "p_cores": null,
+  "e_cores": null,
+  "base_clock_ghz": 3.1,
+  "boost_clock_ghz": 3.6,
+  "l3_cache_mb": null,
+  "tdp_w": null,
+  "max_tdp_w": null,
+  "integrated_graphics": null,
+  "memory_support": "DDR4",
+  "msrp_usd": null,
+  "verified": false,
+  "markings": [
+    "AMD Eng Sample"
+  ],
+  "notes": "Whitehaven 16C/32T engineering sample (ES1 prefix 1). VideoCardz Eng Sample table 3.1/3.6 GHz.",
+  "source_urls": [
+    "https://videocardz.com/newz/amd-engineering-samples-update",
+    "https://en.wikipedia.org/wiki/Zen_(microarchitecture)"
+  ]
+}
diff --git a/data/cpu/amd/2017/hedt/amd-2d2701a9uc9f4.json b/data/cpu/amd/2017/hedt/amd-2d2701a9uc9f4.json
new file mode 100644
index 0000000..bd44711
--- /dev/null
+++ b/data/cpu/amd/2017/hedt/amd-2d2701a9uc9f4.json
@@ -0,0 +1,39 @@
+{
+  "slug": "amd-2d2701a9uc9f4",
+  "name": "AMD Eng Sample 2D2701A9UC9F4",
+  "manufacturer": "amd",
+  "sample_class": "es",
+  "qspec": null,
+  "opn": "2D2701A9UC9F4",
+  "stepping": null,
+  "cpuid": null,
+  "sample_revision": "es2",
+  "retail_equivalent": null,
+  "first_seen_date": null,
+  "release_date": null,
+  "segment": "hedt",
+  "architecture": "Zen",
+  "socket": "TR4",
+  "process_node": "14 nm",
+  "cores": 12,
+  "threads": 24,
+  "p_cores": null,
+  "e_cores": null,
+  "base_clock_ghz": 2.7,
+  "boost_clock_ghz": 3.2,
+  "l3_cache_mb": null,
+  "tdp_w": null,
+  "max_tdp_w": null,
+  "integrated_graphics": null,
+  "memory_support": "DDR4",
+  "msrp_usd": null,
+  "verified": false,
+  "markings": [
+    "AMD Eng Sample"
+  ],
+  "notes": "Whitehaven 12C/24T engineering sample (ES2). VideoCardz Eng Sample table 2.7/3.2 GHz on Alienware R3.",
+  "source_urls": [
+    "https://videocardz.com/newz/amd-engineering-samples-update",
+    "https://en.wikipedia.org/wiki/Zen_(microarchitecture)"
+  ]
+}
diff --git a/data/cpu/amd/2017/hedt/amd-2d3101a8ugaf4.json b/data/cpu/amd/2017/hedt/amd-2d3101a8ugaf4.json
new file mode 100644
index 0000000..b546657
--- /dev/null
+++ b/data/cpu/amd/2017/hedt/amd-2d3101a8ugaf4.json
@@ -0,0 +1,39 @@
+{
+  "slug": "amd-2d3101a8ugaf4",
+  "name": "AMD Eng Sample 2D3101A8UGAF4",
+  "manufacturer": "amd",
+  "sample_class": "es",
+  "qspec": null,
+  "opn": "2D3101A8UGAF4",
+  "stepping": null,
+  "cpuid": null,
+  "sample_revision": "es2",
+  "retail_equivalent": null,
+  "first_seen_date": null,
+  "release_date": null,
+  "segment": "hedt",
+  "architecture": "Zen",
+  "socket": "TR4",
+  "process_node": "14 nm",
+  "cores": 16,
+  "threads": 32,
+  "p_cores": null,
+  "e_cores": null,
+  "base_clock_ghz": 3.1,
+  "boost_clock_ghz": 3.6,
+  "l3_cache_mb": null,
+  "tdp_w": null,
+  "max_tdp_w": null,
+  "integrated_graphics": null,
+  "memory_support": "DDR4",
+  "msrp_usd": null,
+  "verified": false,
+  "markings": [
+    "AMD Eng Sample"
+  ],
+  "notes": "Whitehaven 16C/32T engineering sample (ES2 prefix 2). VideoCardz Eng Sample table 3.1/3.6 GHz.",
+  "source_urls": [
+    "https://videocardz.com/newz/amd-engineering-samples-update",
+    "https://en.wikipedia.org/wiki/Zen_(microarchitecture)"
+  ]
+}
diff --git a/data/cpu/amd/2022/hedt/amd-100-000000454-20-y.json b/data/cpu/amd/2022/hedt/amd-100-000000454-20-y.json
new file mode 100644
index 0000000..2b39c0a
--- /dev/null
+++ b/data/cpu/amd/2022/hedt/amd-100-000000454-20-y.json
@@ -0,0 +1,39 @@
+{
+  "slug": "amd-100-000000454-20-y",
+  "name": "AMD Eng Sample 100-000000454-20_Y",
+  "manufacturer": "amd",
+  "sample_class": "es",
+  "qspec": null,
+  "opn": "100-000000454-20_Y",
+  "stepping": null,
+  "cpuid": null,
+  "sample_revision": "es1",
+  "retail_equivalent": null,
+  "first_seen_date": null,
+  "release_date": null,
+  "segment": "hedt",
+  "architecture": "Zen 4",
+  "socket": "sTR5",
+  "process_node": "TSMC 5 nm",
+  "cores": 64,
+  "threads": 128,
+  "p_cores": null,
+  "e_cores": null,
+  "base_clock_ghz": null,
+  "boost_clock_ghz": null,
+  "l3_cache_mb": null,
+  "tdp_w": null,
+  "max_tdp_w": null,
+  "integrated_graphics": null,
+  "memory_support": "DDR5",
+  "msrp_usd": null,
+  "verified": false,
+  "markings": [
+    "AMD Eng Sample"
+  ],
+  "notes": "Storm Peak 64C/128T engineering sample. Einstein@Home listing AMD Eng Sample 100-000000454-20_Y.",
+  "source_urls": [
+    "https://www.techradar.com/news/threadripper-pro-64-core-monster-cpu-caught-in-the-wild",
+    "https://en.wikipedia.org/wiki/Zen_4"
+  ]
+}
diff --git a/data/cpu/amd/2022/laptop/amd-100-000000552-40-y.json b/data/cpu/amd/2022/laptop/amd-100-000000552-40-y.json
new file mode 100644
index 0000000..77930ff
--- /dev/null
+++ b/data/cpu/amd/2022/laptop/amd-100-000000552-40-y.json
@@ -0,0 +1,40 @@
+{
+  "slug": "amd-100-000000552-40-y",
+  "name": "AMD Eng Sample 100-000000552-40_Y",
+  "manufacturer": "amd",
+  "sample_class": "es",
+  "qspec": null,
+  "opn": "100-000000552-40_Y",
+  "stepping": null,
+  "cpuid": null,
+  "sample_revision": "es1",
+  "retail_equivalent": null,
+  "first_seen_date": null,
+  "release_date": null,
+  "segment": "laptop",
+  "architecture": "Zen 3+",
+  "socket": "FP7",
+  "process_node": "TSMC 6 nm",
+  "cores": 4,
+  "threads": 8,
+  "p_cores": null,
+  "e_cores": null,
+  "base_clock_ghz": 2.9,
+  "boost_clock_ghz": 4.14,
+  "l3_cache_mb": 8,
+  "tdp_w": null,
+  "max_tdp_w": null,
+  "integrated_graphics": null,
+  "memory_support": "DDR5",
+  "msrp_usd": null,
+  "verified": false,
+  "markings": [
+    "AMD Eng Sample"
+  ],
+  "notes": "Rembrandt 4C/8T engineering sample. Geekbench OPN 100-000000552-40_Y. Entry Ryzen 3 6000-class APU.",
+  "source_urls": [
+    "https://wccftech.com/amds-entry-level-quad-core-rembrandt-apu-spotted-benchmarked-rocks-4-zen-3-3-rdna-2-cores/",
+    "https://www.notebookcheck.net/Mystery-four-core-eight-thread-AMD-Rembrandt-processor-makes-Geekbench-debut.637293.0.html",
+    "https://en.wikipedia.org/wiki/Zen_3"
+  ]
+}