From 866ca1468dfa35f319f520d0f7b93b2d0fe32f62 Mon Sep 17 00:00:00 2001
From: Wang Huaqiang <huaqiang.wang@intel.com>
Date: Fri, 2 Aug 2019 17:21:58 +0800
Subject: [PATCH] Add the support of CPU feature 'AVX512-VNNI'

'AVX512-VNNI' is the instruction set for vector neural network
instructions supported since CascadeLake CPU. Enabling this
CPU feature in Nova.

Requires 'os-traints' to be greater than '0.16.0'.

Depends-On: Ia421ed500fbc15bf0088a8436ddeb5d8d1196256
Change-Id: I4ee821cba7cd23f0db9dc2c2c83c78ef5e70ad7b
---
 lower-constraints.txt      | 2 +-
 nova/virt/libvirt/utils.py | 1 +
 requirements.txt           | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lower-constraints.txt b/lower-constraints.txt
index 7c682e63a8ff..34ae760e6373 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -68,7 +68,7 @@ os-brick==2.6.1
 os-client-config==1.29.0
 os-resource-classes==0.1.0
 os-service-types==1.7.0
-os-traits==0.15.0
+os-traits==0.16.0
 os-vif==1.14.0
 os-win==3.0.0
 os-xenapi==0.3.3
diff --git a/nova/virt/libvirt/utils.py b/nova/virt/libvirt/utils.py
index 4f1898ec8735..97d865a0425c 100644
--- a/nova/virt/libvirt/utils.py
+++ b/nova/virt/libvirt/utils.py
@@ -59,6 +59,7 @@ CPU_TRAITS_MAPPING = {
     'avx512f': os_traits.HW_CPU_X86_AVX512F,
     'avx512pf': os_traits.HW_CPU_X86_AVX512PF,
     'avx512vl': os_traits.HW_CPU_X86_AVX512VL,
+    'avx512vnni': os_traits.HW_CPU_X86_AVX512VNNI,
     'bmi1': os_traits.HW_CPU_X86_BMI,
     'bmi2': os_traits.HW_CPU_X86_BMI2,
     'pclmuldq': os_traits.HW_CPU_X86_CLMUL,
diff --git a/requirements.txt b/requirements.txt
index 703f168e5d57..448bf1a784bd 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -56,7 +56,7 @@ psutil>=3.2.2 # BSD
 oslo.versionedobjects>=1.35.0 # Apache-2.0
 os-brick>=2.6.1 # Apache-2.0
 os-resource-classes>=0.1.0 # Apache-2.0
-os-traits>=0.15.0 # Apache-2.0
+os-traits>=0.16.0 # Apache-2.0
 os-vif>=1.14.0 # Apache-2.0
 os-win>=3.0.0 # Apache-2.0
 castellan>=0.16.0 # Apache-2.0