git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v2 02/23] ewah: implement `ewah_bitmap_is_subset()`

From
Taylor Blau <me@ttaylorr.com>
Date
Apr 29, 2024, 20:43 UTC
Message-ID
<290d928325dedd89d8e95aa12e643434b0dd2501.1714422410.git.me@ttaylorr.com>
In-Reply-To
<cover.1714422410.git.me@ttaylorr.com>

In order to know whether a given pseudo-merge (comprised of a "parents" and "objects" bitmaps) is "satisfied" and can be OR'd into the bitmap result, we need to be able to quickly determine whether the "parents" bitmap is a subset of the current set of objects reachable on either side of a traversal.

Implement a helper function to prepare for that, which determines whether an EWAH bitmap (the parents bitmap from the pseudo-merge) is a subset of a non-EWAH bitmap (in this case, the results bitmap from either side of the traversal).

This function makes use of the EWAH iterator to avoid inflating any part of the EWAH bitmap after we determine it is not a subset of the non-EWAH bitmap. This "fail-fast" allows us to avoid a potentially large amount of wasted effort.

Signed-off-by: Taylor Blau <me@ttaylorr.com>
---
 ewah/bitmap.c | 43 +++++++++++++++++++++++++++++++++++++++++++
 ewah/ewok.h   |  6 ++++++
 2 files changed, 49 insertions(+)
diff --git a/ewah/bitmap.c b/ewah/bitmap.c
index ac7e0af622a..d352fec54ce 100644
--- a/ewah/bitmap.c
+++ b/ewah/bitmap.c
@@ -138,6 +138,49 @@ void bitmap_or(struct bitmap *self, const struct bitmap *other)
 		self->words[i] |= other->words[i];
 }
 
+int ewah_bitmap_is_subset(struct ewah_bitmap *self, struct bitmap *other)
+{
+	struct ewah_iterator it;
+	eword_t word;
+	size_t i;
+
+	ewah_iterator_init(&it, self);
+
+	for (i = 0; i < other->word_alloc; i++) {
+		if (!ewah_iterator_next(&word, &it)) {
+			/*
+			 * If we reached the end of `self`, and haven't
+			 * rejected `self` as a possible subset of
+			 * `other` yet, then we are done and `self` is
+			 * indeed a subset of `other`.
+			 */
+			return 1;
+		}
+		if (word & ~other->words[i]) {
+			/*
+			 * Otherwise, compare the next two pairs of
+			 * words. If the word from `self` has bit(s) not
+			 * in the word from `other`, `self` is not a
+			 * subset of `other`.
+			 */
+			return 0;
+		}
+	}
+
+	/*
+	 * If we got to this point, there may be zero or more words
+	 * remaining in `self`, with no remaining words left in `other`.
+	 * If there are any bits set in the remaining word(s) in `self`,
+	 * then `self` is not a subset of `other`.
+	 */
+	while (ewah_iterator_next(&word, &it))
+		if (word)
+			return 0;
+
+	/* `self` is definitely a subset of `other` */
+	return 1;
+}
+
 void bitmap_or_ewah(struct bitmap *self, struct ewah_bitmap *other)
 {
 	size_t original_size = self->word_alloc;
diff --git a/ewah/ewok.h b/ewah/ewok.h
index c11d76c6f33..2b6c4ac499c 100644
--- a/ewah/ewok.h
+++ b/ewah/ewok.h
@@ -179,7 +179,13 @@ void bitmap_unset(struct bitmap *self, size_t pos);
 int bitmap_get(struct bitmap *self, size_t pos);
 void bitmap_free(struct bitmap *self);
 int bitmap_equals(struct bitmap *self, struct bitmap *other);
+
+/*
+ * Both `bitmap_is_subset()` and `ewah_bitmap_is_subset()` return 1 if the set
+ * of bits in 'self' are a subset of the bits in 'other'. Returns 0 otherwise.
+ */
 int bitmap_is_subset(struct bitmap *self, struct bitmap *other);
+int ewah_bitmap_is_subset(struct ewah_bitmap *self, struct bitmap *other);
 
 struct ewah_bitmap * bitmap_to_ewah(struct bitmap *bitmap);
 struct bitmap *ewah_to_bitmap(struct ewah_bitmap *ewah);
-- 
2.45.0.23.gc6f94b99219
Previous: Patrick SteinhardtNext: Taylor Blau
Message 43 of 157 in “pack-bitmap: pseudo-merge reachability bitmaps”
  1. 00/24 pack-bitmap: pseudo-merge reachability bitmapsTaylor Blau, Mar 20, 2024
  2. 01/24 Documentation/technical: describe pseudo-merge bitmaps formatTaylor Blau, Mar 20, 2024
  3. Junio C HamanoMar 21, 2024
  4. Taylor BlauMar 21, 2024
  5. Junio C HamanoMar 21, 2024
  6. 02/24 config: repo_config_get_expiry()Taylor Blau, Mar 20, 2024
  7. Jeff KingApr 10, 2024
  8. Taylor BlauApr 29, 2024
  9. 03/24 ewah: implement `ewah_bitmap_is_subset()`Taylor Blau, Mar 20, 2024
  10. Jeff KingApr 10, 2024
  11. Taylor BlauApr 29, 2024
  12. 04/24 pack-bitmap: drop unused `max_bitmaps` parameterTaylor Blau, Mar 20, 2024
  13. Jeff KingApr 10, 2024
  14. 05/24 pack-bitmap: move some initialization to `bitmap_writer_init()`Taylor Blau, Mar 20, 2024
  15. Jeff KingApr 10, 2024
  16. 06/24 pseudo-merge.ch: initial commitTaylor Blau, Mar 20, 2024
  17. 07/24 pack-bitmap-write: support storing pseudo-merge commitsTaylor Blau, Mar 20, 2024
  18. 08/24 pack-bitmap: implement `bitmap_writer_has_bitmapped_object_id()`Taylor Blau, Mar 20, 2024
  19. 09/24 pack-bitmap: make `bitmap_writer_push_bitmapped_commit()` publicTaylor Blau, Mar 20, 2024
  20. 10/24 pseudo-merge: implement support for selecting pseudo-merge commitsTaylor Blau, Mar 20, 2024
  21. 11/24 pack-bitmap-write.c: select pseudo-merge commitsTaylor Blau, Mar 20, 2024
  22. 12/24 pack-bitmap-write.c: write pseudo-merge tableTaylor Blau, Mar 20, 2024
  23. 13/24 pack-bitmap: extract `read_bitmap()` functionTaylor Blau, Mar 20, 2024
  24. 14/24 pseudo-merge: scaffolding for readsTaylor Blau, Mar 20, 2024
  25. 15/24 pack-bitmap.c: read pseudo-merge extensionTaylor Blau, Mar 20, 2024
  26. 16/24 pseudo-merge: implement support for reading pseudo-merge commitsTaylor Blau, Mar 20, 2024
  27. 17/24 ewah: implement `ewah_bitmap_popcount()`Taylor Blau, Mar 20, 2024
  28. 18/24 pack-bitmap: implement test helpers for pseudo-mergeTaylor Blau, Mar 20, 2024
  29. 19/24 t/test-lib-functions.sh: support `--date` in `test_commit_bulk()`Taylor Blau, Mar 20, 2024
  30. 20/24 pack-bitmap.c: use pseudo-merges during traversalTaylor Blau, Mar 20, 2024
  31. 21/24 pack-bitmap: extra trace2 informationTaylor Blau, Mar 20, 2024
  32. 22/24 ewah: `bitmap_equals_ewah()`Taylor Blau, Mar 20, 2024
  33. 23/24 pseudo-merge: implement support for finding existing mergesTaylor Blau, Mar 20, 2024
  34. 24/24 t/perf: implement performace tests for pseudo-merge bitmapsTaylor Blau, Mar 20, 2024
  35. Junio C HamanoMar 21, 2024
  36. 00/23 pack-bitmap: pseudo-merge reachability bitmapsTaylor Blau, Apr 29, 2024
  37. 01/23 Documentation/technical: describe pseudo-merge bitmaps formatTaylor Blau, Apr 29, 2024
  38. Patrick SteinhardtMay 6, 2024
  39. Taylor BlauMay 6, 2024
  40. Patrick SteinhardtMay 10, 2024
  41. Taylor BlauMay 13, 2024
  42. Patrick SteinhardtMay 14, 2024
  43. 02/23 ewah: implement `ewah_bitmap_is_subset()`Taylor Blau, Apr 29, 2024
  44. 03/23 pack-bitmap: drop unused `max_bitmaps` parameterTaylor Blau, Apr 29, 2024
  45. 04/23 pack-bitmap: move some initialization to `bitmap_writer_init()`Taylor Blau, Apr 29, 2024
  46. Patrick SteinhardtMay 6, 2024
  47. Taylor BlauMay 6, 2024
  48. 05/23 pseudo-merge.ch: initial commitTaylor Blau, Apr 29, 2024
  49. 06/23 pack-bitmap-write: support storing pseudo-merge commitsTaylor Blau, Apr 29, 2024
  50. Patrick SteinhardtMay 6, 2024
  51. Taylor BlauMay 6, 2024
  52. Patrick SteinhardtMay 10, 2024
  53. Jeff KingMay 13, 2024
  54. Taylor BlauMay 13, 2024
  55. 07/23 pack-bitmap: implement `bitmap_writer_has_bitmapped_object_id()`Taylor Blau, Apr 29, 2024
  56. 08/23 pack-bitmap: make `bitmap_writer_push_bitmapped_commit()` publicTaylor Blau, Apr 29, 2024
  57. Jeff KingMay 13, 2024
  58. Taylor BlauMay 14, 2024
  59. 09/23 pseudo-merge: implement support for selecting pseudo-merge commitsTaylor Blau, Apr 29, 2024
  60. Patrick SteinhardtMay 6, 2024
  61. Taylor BlauMay 6, 2024
  62. Jeff KingMay 13, 2024
  63. Taylor BlauMay 14, 2024
  64. Jeff KingMay 16, 2024
  65. Junio C HamanoMay 16, 2024
  66. 10/23 pack-bitmap-write.c: select pseudo-merge commitsTaylor Blau, Apr 29, 2024
  67. Patrick SteinhardtMay 6, 2024
  68. Taylor BlauMay 6, 2024
  69. Patrick SteinhardtMay 10, 2024
  70. 11/23 pack-bitmap-write.c: write pseudo-merge tableTaylor Blau, Apr 29, 2024
  71. 12/23 pack-bitmap: extract `read_bitmap()` functionTaylor Blau, Apr 29, 2024
  72. 13/23 pseudo-merge: scaffolding for readsTaylor Blau, Apr 29, 2024
  73. 14/23 pack-bitmap.c: read pseudo-merge extensionTaylor Blau, Apr 29, 2024
  74. 15/23 pseudo-merge: implement support for reading pseudo-merge commitsTaylor Blau, Apr 29, 2024
  75. 16/23 ewah: implement `ewah_bitmap_popcount()`Taylor Blau, Apr 29, 2024
  76. 17/23 pack-bitmap: implement test helpers for pseudo-mergeTaylor Blau, Apr 29, 2024
  77. 18/23 t/test-lib-functions.sh: support `--date` in `test_commit_bulk()`Taylor Blau, Apr 29, 2024
  78. 19/23 pack-bitmap.c: use pseudo-merges during traversalTaylor Blau, Apr 29, 2024
  79. 20/23 pack-bitmap: extra trace2 informationTaylor Blau, Apr 29, 2024
  80. 21/23 ewah: `bitmap_equals_ewah()`Taylor Blau, Apr 29, 2024
  81. 22/23 pseudo-merge: implement support for finding existing mergesTaylor Blau, Apr 29, 2024
  82. 23/23 t/perf: implement performace tests for pseudo-merge bitmapsTaylor Blau, Apr 29, 2024
  83. Junio C HamanoApr 30, 2024
  84. Taylor BlauMay 1, 2024
  85. 00/30 pack-bitmap: pseudo-merge reachability bitmapsTaylor Blau, May 21, 2024
  86. 01/30 object.h: add flags allocated by pack-bitmap.hTaylor Blau, May 21, 2024
  87. Taylor BlauMay 21, 2024
  88. 07/30 Documentation/gitpacking.txt: initial commitTaylor Blau, May 21, 2024
  89. 08/30 Documentation/gitpacking.txt: describe pseudo-merge bitmapsTaylor Blau, May 21, 2024
  90. 09/30 Documentation/technical: describe pseudo-merge bitmaps formatTaylor Blau, May 21, 2024
  91. 10/30 ewah: implement `ewah_bitmap_is_subset()`Taylor Blau, May 21, 2024
  92. 11/30 pack-bitmap: move some initialization to `bitmap_writer_init()`Taylor Blau, May 21, 2024
  93. 12/30 pseudo-merge.ch: initial commitTaylor Blau, May 21, 2024
  94. 13/30 pack-bitmap-write: support storing pseudo-merge commitsTaylor Blau, May 21, 2024
  95. 14/30 pack-bitmap: implement `bitmap_writer_has_bitmapped_object_id()`Taylor Blau, May 21, 2024
  96. 15/30 pack-bitmap: make `bitmap_writer_push_bitmapped_commit()` publicTaylor Blau, May 21, 2024
  97. 16/30 config: introduce git_config_float()Taylor Blau, May 21, 2024
  98. Jeff KingMay 23, 2024
  99. Taylor BlauMay 23, 2024
  100. 17/30 pseudo-merge: implement support for selecting pseudo-merge commitsTaylor Blau, May 21, 2024
  101. Jeff KingMay 23, 2024
  102. Taylor BlauMay 23, 2024
  103. 18/30 pack-bitmap-write.c: write pseudo-merge tableTaylor Blau, May 21, 2024
  104. 19/30 pack-bitmap: extract `read_bitmap()` functionTaylor Blau, May 21, 2024
  105. 20/30 pseudo-merge: scaffolding for readsTaylor Blau, May 21, 2024
  106. 21/30 pack-bitmap.c: read pseudo-merge extensionTaylor Blau, May 21, 2024
  107. 22/30 pseudo-merge: implement support for reading pseudo-merge commitsTaylor Blau, May 21, 2024
  108. Jeff KingMay 23, 2024
  109. Taylor BlauMay 23, 2024
  110. 23/30 ewah: implement `ewah_bitmap_popcount()`Taylor Blau, May 21, 2024
  111. 24/30 pack-bitmap: implement test helpers for pseudo-mergeTaylor Blau, May 21, 2024
  112. 25/30 t/test-lib-functions.sh: support `--date` in `test_commit_bulk()`Taylor Blau, May 21, 2024
  113. Jeff KingMay 23, 2024
  114. Junio C HamanoMay 23, 2024
  115. Taylor BlauMay 23, 2024
  116. 26/30 pack-bitmap.c: use pseudo-merges during traversalTaylor Blau, May 21, 2024
  117. Jeff KingMay 23, 2024
  118. Taylor BlauMay 23, 2024
  119. 27/30 pack-bitmap: extra trace2 informationTaylor Blau, May 21, 2024
  120. 28/30 ewah: `bitmap_equals_ewah()`Taylor Blau, May 21, 2024
  121. 29/30 pseudo-merge: implement support for finding existing mergesTaylor Blau, May 21, 2024
  122. 30/30 t/perf: implement performace tests for pseudo-merge bitmapsTaylor Blau, May 21, 2024
  123. Jeff KingMay 23, 2024
  124. Taylor BlauMay 23, 2024
  125. Jeff KingMay 25, 2024
  126. Jeff KingMay 23, 2024
  127. Taylor BlauMay 23, 2024
  128. Jeff KingMay 25, 2024
  129. Taylor BlauMay 23, 2024
  130. 00/24 pack-bitmap: pseudo-merge reachability bitmapsTaylor Blau, May 23, 2024
  131. 01/24 Documentation/gitpacking.txt: initial commitTaylor Blau, May 23, 2024
  132. 02/24 Documentation/gitpacking.txt: describe pseudo-merge bitmapsTaylor Blau, May 23, 2024
  133. 03/24 Documentation/technical: describe pseudo-merge bitmaps formatTaylor Blau, May 23, 2024
  134. 04/24 ewah: implement `ewah_bitmap_is_subset()`Taylor Blau, May 23, 2024
  135. 05/24 pack-bitmap: move some initialization to `bitmap_writer_init()`Taylor Blau, May 23, 2024
  136. 06/24 pseudo-merge.ch: initial commitTaylor Blau, May 23, 2024
  137. 07/24 pack-bitmap-write: support storing pseudo-merge commitsTaylor Blau, May 23, 2024
  138. 08/24 pack-bitmap: implement `bitmap_writer_has_bitmapped_object_id()`Taylor Blau, May 23, 2024
  139. 09/24 pack-bitmap: make `bitmap_writer_push_bitmapped_commit()` publicTaylor Blau, May 23, 2024
  140. 10/24 config: introduce `git_config_double()`Taylor Blau, May 23, 2024
  141. 11/24 pseudo-merge: implement support for selecting pseudo-merge commitsTaylor Blau, May 23, 2024
  142. Jeff KingMay 25, 2024
  143. 12/24 pack-bitmap-write.c: write pseudo-merge tableTaylor Blau, May 23, 2024
  144. 13/24 pack-bitmap: extract `read_bitmap()` functionTaylor Blau, May 23, 2024
  145. 14/24 pseudo-merge: scaffolding for readsTaylor Blau, May 23, 2024
  146. 15/24 pack-bitmap.c: read pseudo-merge extensionTaylor Blau, May 23, 2024
  147. 16/24 pseudo-merge: implement support for reading pseudo-merge commitsTaylor Blau, May 23, 2024
  148. 17/24 ewah: implement `ewah_bitmap_popcount()`Taylor Blau, May 23, 2024
  149. 18/24 pack-bitmap: implement test helpers for pseudo-mergeTaylor Blau, May 23, 2024
  150. 19/24 t/test-lib-functions.sh: support `--notick` in `test_commit_bulk()`Taylor Blau, May 23, 2024
  151. Jeff KingMay 25, 2024
  152. 20/24 pack-bitmap.c: use pseudo-merges during traversalTaylor Blau, May 23, 2024
  153. 21/24 pack-bitmap: extra trace2 informationTaylor Blau, May 23, 2024
  154. 22/24 ewah: `bitmap_equals_ewah()`Taylor Blau, May 23, 2024
  155. 23/24 pseudo-merge: implement support for finding existing mergesTaylor Blau, May 23, 2024
  156. 24/24 t/perf: implement performance tests for pseudo-merge bitmapsTaylor Blau, May 23, 2024
  157. Jeff KingMay 25, 2024

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.