BaseTools: Cannot store library cache of different arch together

https://bugzilla.tianocore.org/show_bug.cgi?id=1895

Build cache cannot store cache for the same library modules
in different arch together. E.g. Both the below IA32 and X64
arch BaseLib caches should exist after build Ovmf3264, but now
only the one in X64 arch exist.
The reason is the current Basetool use a set() to same all
library AutoGen objects, but the different arch lib AutoGen
objects have same __hash_ value which comes from the lib
MetaFile(The path of module file):
    def __hash__(self):
        return hash(self.MetaFile)

So the different arch lib AutoGen objects are duplicated one
to the set() and only one can exist. This is why the Basetool
can only store one arch cache for library.

This patch adds the arch string into the PlatformAutoGen and
ModuleAutoGen __hash_ definitions and ensure the different
platform and module AutoGen objects have different __hash_ values.

Cc: Liming Gao <liming.gao@intel.com>
Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Christian Rodriguez <christian.rodriguez@intel.com>
Signed-off-by: Steven Shi <steven.shi@intel.com>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>

diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py
index f59a8038d5a7cf7a5ffa82e2cb6ec235559f7ddf..bedd871136575f2ecb5dabf5a8b446f674415bd0 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
@@ -1166,6 +1166,17 @@ class PlatformAutoGen(AutoGen):
 \r
         return True\r
 \r
+    ## hash() operator of PlatformAutoGen\r
+    #\r
+    #  The platform file path and arch string will be used to represent\r
+    #  hash value of this object\r
+    #\r
+    #   @retval   int Hash value of the platform file path and arch\r
+    #\r
+    @cached_class_function\r
+    def __hash__(self):\r
+        return hash((self.MetaFile, self.Arch))\r
+\r
     @cached_class_function\r
     def __repr__(self):\r
         return "%s [%s]" % (self.MetaFile, self.Arch)\r
@@ -2579,6 +2590,16 @@ class ModuleAutoGen(AutoGen):
         self.ReferenceModules = []\r
         self.ConstPcd                  = {}\r
 \r
+    ## hash() operator of ModuleAutoGen\r
+    #\r
+    #  The module file path and arch string will be used to represent\r
+    #  hash value of this object\r
+    #\r
+    #   @retval   int Hash value of the module file path and arch\r
+    #\r
+    @cached_class_function\r
+    def __hash__(self):\r
+        return hash((self.MetaFile, self.Arch))\r
 \r
     def __repr__(self):\r
         return "%s [%s]" % (self.MetaFile, self.Arch)\r