rls1801 report: meltdown and spectremeltdown static content edits.

Change-Id: Ia81a2fc86884a5c13deabce9b7e68b57d307ef5c
Signed-off-by: Maciek Konstantynowicz <mkonstan@cisco.com>
(cherry picked from commit 1701c0a9db9cc57423e5d1a9009788d0a707ecd6)

4 files changed, 31 insertions, 25 deletions

diff --git a/docs/report/vpp_performance_tests/performance_impact_meltdown/index.rst b/docs/report/vpp_performance_tests/impact_meltdown/index.rst
index 1f60d260f2..a2302ed67c 100644
--- a/docs/report/vpp_performance_tests/performance_impact_meltdown/index.rst
+++ b/docs/report/vpp_performance_tests/impact_meltdown/index.rst
@@ -1,17 +1,21 @@
-Performance Impact of Meltdown Patches
-======================================
+Impact of Meltdown Patches
+==========================
 
-The following tables present performance impact on VPP after
-applying patches addressing Meltdown (Variant3: Rogue Data Cache Load) security
- ulnerabilities. Incremental kernel patches are applied for Ubuntu 16.04LTS as
-documented on `Ubuntu SpectreAndMeltdown page <https://wiki.ubuntu.com/SecurityTeam/KnowledgeBase/SpectreAndMeltdown>`_.
-For detailed listing of used software versions and patches please refer
-to :ref:`test_environment`.
+Following sections list changes to VPP throughput performance after applying
+patches addressing security vulnerabilities referred to as Meltdown
+(Variant3: Rogue Data Cache Load). Incremental kernel patches are
+applied for Ubuntu 16.04LTS as documented on
+`Ubuntu SpectreAndMeltdown page <https://wiki.ubuntu.com/SecurityTeam/KnowledgeBase/SpectreAndMeltdown>`_.
+Detailed listing of used software versions and patches is documented in
+:ref:`test_environment`.
 
 NDR and PDR packet throughput results are compared for 1-core/1-thread,
 2-cores/2-threads and 4-cores/4-threads VPP configurations, with
 reference performance numbers coming from tests without the Meltdown
-patches.
+patches. Tables show test results grouped into Best 20 changes (minimal
+performance impact), followed by Worst 20 changes (maximal performance
+impact). All results are also provided in downloadable CSV and pretty
+ASCII formats.
 
 NDR throughput: Best 20 changes
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/docs/report/vpp_performance_tests/performance_impact_spectre/index.rst b/docs/report/vpp_performance_tests/impact_spectreandmeltdown/index.rst
index cf5202553e..39fcd9c88a 100644
--- a/docs/report/vpp_performance_tests/performance_impact_spectre/index.rst
+++ b/docs/report/vpp_performance_tests/impact_spectreandmeltdown/index.rst
@@ -1,20 +1,24 @@
-Performance Impact of Meltdown and Spectre Patches
-==================================================
-
-The following tables present performance impact on VPP after applying
-patches addressing Meltdown (Variant3: Rogue Data Cache Load) and
-Spectre (Variant1: Bounds Check Bypass; Variant2: Branch Target
-Injection) security vulnerabilities. Incremental kernel patches for
-Ubuntu 16.04 LTS as documented on
+Impact of SpectreAndMeltdown Patches
+====================================
+
+Following sections list changes to VPP throughput performance after
+applying patches addressing security vulnerabilities referred to as:
+Meltdown (Variant3: Rogue Data Cache Load) and Spectre (Variant1: Bounds
+Check Bypass; Variant2: Branch Target Injection) security
+vulnerabilities. Incremental kernel patches for Ubuntu 16.04 LTS as
+documented on
 `Ubuntu SpectreAndMeltdown page <https://wiki.ubuntu.com/SecurityTeam/KnowledgeBase/SpectreAndMeltdown>`_.
 For Spectre additional Processor microcode and BIOS firmware changes are
-applied. For detailed listing of used software versions and patches
-please refer to :ref:`test_environment`.
+applied. Detailed listing of used software versions and patches is
+documented in :ref:`test_environment`.
 
 NDR and PDR packet throughput results are compared for 1-core/1-thread,
 2-cores/2-threads and 4-cores/4-threads VPP configurations, with
-reference performance numbers coming from tests without the Meltdown and
-Spectre patches.
+reference performance numbers coming from tests without the Meltdown
+patches. Tables show test results grouped into Best 20 changes (minimal
+performance impact), followed by Worst 20 changes (maximal performance
+impact). All results are also provided in downloadable CSV and pretty
+ASCII formats.
 
 NDR throughput: Best 20 changes
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/docs/report/vpp_performance_tests/index.rst b/docs/report/vpp_performance_tests/index.rst
index 0cdea485e9..d26addcfb1 100644
--- a/docs/report/vpp_performance_tests/index.rst
+++ b/docs/report/vpp_performance_tests/index.rst
@@ -8,7 +8,7 @@ VPP Performance Tests
     packet_throughput_graphs/index
     packet_latency_graphs/index
     throughput_speedup_multi_core/index
-    performance_impact_meltdown/index
-    performance_impact_spectre/index
+    impact_meltdown/index
+    impact_spectreandmeltdown/index
     test_environment
     documentation/index
diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index d898241b94..e8884623a1 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -44,8 +44,6 @@
     DIR[DTR,FUNC,HC]: "{DIR[DTR]}/honeycomb_functional_results"
     DIR[DTR,FUNC,NSHSFC]: "{DIR[DTR]}/nshsfc_functional_results"
     DIR[DTR,PERF,VPP,IMPRV]: "{DIR[WORKING,SRC]}/vpp_performance_tests/performance_improvements"
-    DIR[DTR,PERF,VPP,IMPACT,SPECTRE]: "{DIR[WORKING,SRC]}/vpp_performance_tests/performance_impact_spectre"
-    DIR[DTR,PERF,VPP,IMPACT,MELTDOWN]: "{DIR[WORKING,SRC]}/vpp_performance_tests/performance_impact_meltdown"
 
     # Detailed test configurations
     DIR[DTC]: "{DIR[WORKING,SRC]}/test_configuration"