Fixed discrepancy in product enumeration between IGC and gmmlib.

Change-Id: I2cf39d1ab2531749dddb6859965f6a854ef0c918

Author: mbelicki

IGC/Compiler/igc_workaround.cpp

@@ -86,9 +86,6 @@ namespace IGC
         case IGFX_JASPERLAKE:
             InitJslHwWaTable(&waTable, pSkuFeatureTable, &stWaInitParam);
             break;
-        case IGFX_ELKHARTLAKE:
-            InitEhlHwWaTable(&waTable, pSkuFeatureTable, &stWaInitParam);
-            break;
         default:
             assert(false);
             break;

inc/common/igfxfmid.h

@@ -40,8 +40,8 @@ typedef enum {
     IGFX_ICELAKE,
     IGFX_ICELAKE_LP,
     IGFX_LAKEFIELD,
-    IGFX_ELKHARTLAKE,
     IGFX_JASPERLAKE,
+    IGFX_ELKHARTLAKE = IGFX_JASPERLAKE,
     IGFX_TIGERLAKE_LP,
     IGFX_MAX_PRODUCT,