Remove dg1; Update doc

Author: uditagarwal97

sycl/test-e2e/README.md

@@ -232,6 +232,10 @@ environment:
  * **aspect-\<name\>**: - SYCL aspects supported by a device;
  * **arch-\<name\>** - [SYCL architecture](https://github.com/intel/llvm/blob/sycl/sycl/doc/extensions/experimental/sycl_ext_oneapi_device_architecture.asciidoc) of a device (e.g. `arch-intel_gpu_pvc`, the name matches what you
    can pass into `-fsycl-targets` compiler flag);
+ * **gpu-intel-dg2**  - Intel GPU DG2 availability; Automatically set if device
+    architecture belongs to DG2 family;
+ * **gpu-intel-gen11**  - Intel GPU Gen11 availability; Automatically set if device architecture belongs to Gen11 family;
+ * **gpu-intel-gen12**  - Intel GPU DG2 availability; Automatically set if device architecture belongs to Gen12 family;
 
 ### Manually-set features
 
@@ -240,18 +244,10 @@ section below). All these features are related to HW detection and they should
 be considered deprecated, because we have HW auto-detection functionality in
 place. No new tests should use these features:
 
- * **gpu-intel-gen11** - Intel GPU Gen11 availability;
- * **gpu-intel-gen12** - Intel GPU Gen12 availability;
  * **gpu-intel-dg1** - Intel GPU DG1 availability;
- * **gpu-intel-dg2** - Intel GPU DG2 availability;
  * **gpu-intel-pvc** - Intel GPU PVC availability;
  * **gpu-intel-pvc-vg** - Intel GPU PVC-VG availability;
 
-Note: some of those features describing whole GPU families and auto-detection
-of HW does not provide this functionality at the moment. As an improvement, we
-could add those features even with auto-detection, because the only alternative
-at the moment is to explicitly list every architecture from a family.
-
 ## llvm-lit parameters
 
 Following options can be passed to llvm-lit tool through --param option to

sycl/test-e2e/lit.cfg.py

@@ -173,11 +173,9 @@
 if lit_config.params.get("igc-dev", False):
     config.available_features.add("igc-dev")
 
-# Map between architecture types and device name.
-device_name_arch_map = {
-    # <Device name> : Set of architectures types (and aliases)
-    # DG1
-    "gpu-intel-dg1": {"intel_gpu_dg1"},
+# Map between device family and architecture types.
+device_family_arch_map = {
+    # <Family name> : Set of architectures types (and aliases)
     # DG2
     "gpu-intel-dg2": {
         "intel_gpu_acm_g12",
@@ -193,11 +191,10 @@
     "gpu-intel-gen11": {"intel_gpu_icllp", "intel_gpu_icl"},
 }
 
-
-def get_device_name_from_arch(arch):
-    for device_name, arch_set in device_name_arch_map.items():
+def get_device_family_from_arch(arch):
+    for device_family, arch_set in device_family_arch_map.items():
         if arch in arch_set:
-            return device_name
+            return device_family
     return None
 
 def check_igc_tag_and_add_feature():
@@ -795,27 +792,27 @@ def open_check_file(file_name):
     aspect_features = set("aspect-" + a for a in aspects)
     sg_size_features = set("sg-" + s for s in sg_sizes)
     architecture_feature = set("arch-" + s for s in architectures)
-    # Add device name features like intel-gpu-gen12, intel-gpu-dg2 based on
+    # Add device family features like intel-gpu-gen12, intel-gpu-dg2 based on
     # the architecture reported by sycl-ls.
-    device_names = set(
-        get_device_name_from_arch(arch)
+    device_family = set(
+        get_device_family_from_arch(arch)
         for arch in architectures
-        if get_device_name_from_arch(arch) is not None
+        if get_device_family_from_arch(arch) is not None
     )
 
     # Print the detected GPU family name.
-    if len(device_names) > 0:
+    if len(device_family) > 0:
         lit_config.note(
             "Detected GPU family for {}: {}".format(
-                sycl_device, ", ".join(device_names)
+                sycl_device, ", ".join(device_family)
             )
         )
 
     features = set()
     features.update(aspect_features)
     features.update(sg_size_features)
     features.update(architecture_feature)
-    features.update(device_names)
+    features.update(device_family)
 
     be, dev = sycl_device.split(":")
     features.add(dev.replace("fpga", "accelerator"))